ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 17:55:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

replace llsd xml fw encoder

Browse Source
This commit is contained in:
UbitUmarov
2020-10-13 16:20:55 +01:00
parent 1fc6f84790
commit c70904418a
9 changed files with 170 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
View File

@@ -2208,11 +2208,11 @@ namespace OpenSim.Region.CoreModules.World.Land
}
//m_log.DebugFormat("[LAND MANAGEMENT MODULE]: Got parcelID {0} {1}", parcelID, parcelID == UUID.Zero ? args.ToString() :"");
StringBuilder sb = LLSDxmlEncode.Start();
LLSDxmlEncode.AddMap(sb);
LLSDxmlEncode.AddElem("parcel_id", parcelID,sb);
LLSDxmlEncode.AddEndMap(sb);
response.RawBuffer = Util.UTF8.GetBytes(LLSDxmlEncode.End(sb));
osUTF8 sb = LLSDxmlEncode2.Start();
LLSDxmlEncode2.AddMap(sb);
LLSDxmlEncode2.AddElem("parcel_id", parcelID,sb);
LLSDxmlEncode2.AddEndMap(sb);
response.RawBuffer = LLSDxmlEncode2.EndToBytes(sb);
response.StatusCode = (int)HttpStatusCode.OK;
}

89
OpenSim/Region/CoreModules/World/LightShare/EnvironmentModule.cs
View File

@@ -444,13 +444,13 @@ namespace OpenSim.Region.CoreModules.World.LightShare
}
}
StringBuilder sb = LLSDxmlEncode.Start();
LLSDxmlEncode.AddMap(sb);
LLSDxmlEncode.AddElem("messageID", UUID.Zero, sb);
LLSDxmlEncode.AddElem("regionID", regionID, sb);
LLSDxmlEncode.AddElem("success", true, sb);
LLSDxmlEncode.AddEndMap(sb);
httpResponse.RawBuffer = Util.UTF8.GetBytes(LLSDxmlEncode.End(sb));
osUTF8 sb = LLSDxmlEncode2.Start();
LLSDxmlEncode2.AddMap(sb);
LLSDxmlEncode2.AddElem("messageID", UUID.Zero, sb);
LLSDxmlEncode2.AddElem("regionID", regionID, sb);
LLSDxmlEncode2.AddElem("success", true, sb);
LLSDxmlEncode2.AddEndMap(sb);
httpResponse.RawBuffer = LLSDxmlEncode2.EndToBytes(sb);
httpResponse.StatusCode = (int)HttpStatusCode.OK;
}
@@ -498,14 +498,14 @@ namespace OpenSim.Region.CoreModules.World.LightShare
byte[] envBytes = VEnv.ToCapBytes(regionID, parcelid);
if(envBytes == null)
{
StringBuilder sb = LLSDxmlEncode.Start();
LLSDxmlEncode.AddArray(sb);
LLSDxmlEncode.AddMap(sb);
LLSDxmlEncode.AddElem("messageID", UUID.Zero, sb);
LLSDxmlEncode.AddElem("regionID", regionID, sb);
LLSDxmlEncode.AddEndMap(sb);
LLSDxmlEncode.AddEndArray(sb);
httpResponse.RawBuffer = LLSDxmlEncode.EndToNBBytes(sb);
osUTF8 sb = LLSDxmlEncode2.Start();
LLSDxmlEncode2.AddArray(sb);
LLSDxmlEncode2.AddMap(sb);
LLSDxmlEncode2.AddElem("messageID", UUID.Zero, sb);
LLSDxmlEncode2.AddElem("regionID", regionID, sb);
LLSDxmlEncode2.AddEndMap(sb);
LLSDxmlEncode2.AddEndArray(sb);
httpResponse.RawBuffer = LLSDxmlEncode2.EndToBytes(sb);
}
else
httpResponse.RawBuffer = envBytes;
@@ -520,7 +520,7 @@ namespace OpenSim.Region.CoreModules.World.LightShare
int parcel = -1;
int track = -1;
StringBuilder sb = LLSDxmlEncode.Start();
osUTF8 sb = LLSDxmlEncode2.Start();
ScenePresence sp = m_scene.GetScenePresence(agentID);
if (sp == null || sp.IsChildAgent || sp.IsNPC)
@@ -653,12 +653,12 @@ namespace OpenSim.Region.CoreModules.World.LightShare
m_log.InfoFormat("[{0}]: ExtEnvironment region {1} settings from agentID {2} saved",
Name, caps.RegionName, agentID);
LLSDxmlEncode.AddMap(sb);
LLSDxmlEncode.AddElem("messageID", UUID.Zero, sb);
LLSDxmlEncode.AddElem("regionID", regionID, sb);
LLSDxmlEncode.AddElem("success", success, sb);
LLSDxmlEncode.AddEndMap(sb);
httpResponse.RawBuffer = Util.UTF8NBGetbytes(LLSDxmlEncode.End(sb));
LLSDxmlEncode2.AddMap(sb);
LLSDxmlEncode2.AddElem("messageID", UUID.Zero, sb);
LLSDxmlEncode2.AddElem("regionID", regionID, sb);
LLSDxmlEncode2.AddElem("success", success, sb);
LLSDxmlEncode2.AddEndMap(sb);
httpResponse.RawBuffer = LLSDxmlEncode2.EndToBytes(sb);
httpResponse.StatusCode = (int)HttpStatusCode.OK;
return;
}
@@ -673,16 +673,13 @@ namespace OpenSim.Region.CoreModules.World.LightShare
}
Error:
string response;
LLSDxmlEncode.AddMap(sb);
LLSDxmlEncode.AddElem("success", success, sb);
LLSDxmlEncode2.AddMap(sb);
LLSDxmlEncode2.AddElem("success", success, sb);
if(!success)
LLSDxmlEncode.AddElem("message", message, sb);
LLSDxmlEncode.AddEndMap(sb);
response = LLSDxmlEncode.End(sb);
LLSDxmlEncode2.AddElem("message", message, sb);
LLSDxmlEncode2.AddEndMap(sb);
httpResponse.RawBuffer = Util.UTF8NBGetbytes(response);
httpResponse.RawBuffer = LLSDxmlEncode2.EndToBytes(sb);
httpResponse.StatusCode = (int)HttpStatusCode.OK;
}
@@ -717,14 +714,14 @@ namespace OpenSim.Region.CoreModules.World.LightShare
byte[] envBytes = VEnv.ToCapWLBytes(UUID.Zero, regionID);
if(envBytes == null)
{
StringBuilder sb = LLSDxmlEncode.Start();
LLSDxmlEncode.AddArray(sb);
LLSDxmlEncode.AddMap(sb);
LLSDxmlEncode.AddElem("messageID", UUID.Zero, sb);
LLSDxmlEncode.AddElem("regionID", regionID, sb);
LLSDxmlEncode.AddEndMap(sb);
LLSDxmlEncode.AddEndArray(sb);
response.RawBuffer = LLSDxmlEncode.EndToNBBytes(sb);
osUTF8 sb = LLSDxmlEncode2.Start();
LLSDxmlEncode2.AddArray(sb);
LLSDxmlEncode2.AddMap(sb);
LLSDxmlEncode2.AddElem("messageID", UUID.Zero, sb);
LLSDxmlEncode2.AddElem("regionID", regionID, sb);
LLSDxmlEncode2.AddEndMap(sb);
LLSDxmlEncode2.AddEndArray(sb);
response.RawBuffer = LLSDxmlEncode2.EndToBytes(sb);
}
else
response.RawBuffer = envBytes;
@@ -789,15 +786,15 @@ namespace OpenSim.Region.CoreModules.World.LightShare
}
Error:
StringBuilder sb = LLSDxmlEncode.Start();
LLSDxmlEncode.AddMap(sb);
LLSDxmlEncode.AddElem("messageID", UUID.Zero, sb);
LLSDxmlEncode.AddElem("regionID", regionID, sb);
LLSDxmlEncode.AddElem("success", success, sb);
osUTF8 sb = LLSDxmlEncode2.Start();
LLSDxmlEncode2.AddMap(sb);
LLSDxmlEncode2.AddElem("messageID", UUID.Zero, sb);
LLSDxmlEncode2.AddElem("regionID", regionID, sb);
LLSDxmlEncode2.AddElem("success", success, sb);
if(!success)
LLSDxmlEncode.AddElem("fail_reason", fail_reason, sb);
LLSDxmlEncode.AddEndMap(sb);
response.RawBuffer = Util.UTF8NBGetbytes(LLSDxmlEncode.End(sb));
LLSDxmlEncode2.AddElem("fail_reason", fail_reason, sb);
LLSDxmlEncode2.AddEndMap(sb);
response.RawBuffer = LLSDxmlEncode2.EndToBytes(sb);
response.StatusCode = (int)HttpStatusCode.OK;
}