Miko/libremetaverse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LIBOMV-576 Merged ClientHelpers and Helpers classes, ClientHelpers methods can once again be directly accessed through the static Helpers class.

Browse Source 
git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@3130 52acb1d6-8a22-11de-b505-999d5b087335
This commit is contained in:
Jim Radford
2009-10-07 03:47:02 +00:00
parent acdb971f13
commit 3f3c4e182f
6 changed files with 47 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Programs/PrimWorkshop/frmBrowser.cs
View File

@@ -328,7 +328,7 @@ namespace PrimWorkshop
textures = 0;
// Write the LLSD to the hard drive in XML format
string output = OSDParser.SerializeLLSDXmlString(ClientHelpers.PrimListToOSD(primList));
string output = OSDParser.SerializeLLSDXmlString(Helpers.PrimListToOSD(primList));
try
{
// Create a temporary directory
@@ -499,7 +499,7 @@ namespace PrimWorkshop
// Decode the .prims file
string raw = File.ReadAllText(primFile);
OSD osd = OSDParser.DeserializeLLSDXml(raw);
return ClientHelpers.OSDToPrimList(osd);
return Helpers.OSDToPrimList(osd);
}
catch (Exception e)
{

2
Programs/PrimWorkshop/frmPrimWorkshop.cs
View File

@@ -275,7 +275,7 @@ namespace PrimWorkshop
if (osd != null && osd.Type == OSDType.Map)
{
List<Primitive> primList = ClientHelpers.OSDToPrimList(osd);
List<Primitive> primList = Helpers.OSDToPrimList(osd);
Prims = new List<FacetedMesh>(primList.Count);
for (int i = 0; i < primList.Count; i++)

2
Programs/examples/TestClient/Commands/Prims/ExportCommand.cs
View File

@@ -100,7 +100,7 @@ namespace OpenMetaverse.TestClient
Logger.Log(uuid.ToString(), Helpers.LogLevel.Warning, Client);
}
string output = OSDParser.SerializeLLSDXmlString(ClientHelpers.PrimListToOSD(prims));
string output = OSDParser.SerializeLLSDXmlString(Helpers.PrimListToOSD(prims));
try { File.WriteAllText(file, output); }
catch (Exception e) { return e.Message; }

2
Programs/examples/TestClient/Commands/Prims/ImportCommand.cs
View File

@@ -63,7 +63,7 @@ namespace OpenMetaverse.TestClient
try { xml = File.ReadAllText(filename); }
catch (Exception e) { return e.Message; }
try { prims = ClientHelpers.OSDToPrimList(OSDParser.DeserializeLLSDXml(xml)); }
try { prims = Helpers.OSDToPrimList(OSDParser.DeserializeLLSDXml(xml)); }
catch (Exception e) { return "Failed to deserialize " + filename + ": " + e.Message; }
// Build an organized structure from the imported prims