From 3234472d6203671a492a73042a0b56d6301903e0 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Wed, 19 Nov 2008 06:15:21 +0000
Subject: Reverting the texture sending patch and the new libOMV. This makes
this release a direct descendant of the stable 7364, with all the features
and none of the issues. This omits the following patch chain: r7383 r7382
r7381 r7377 r7375 r7373 r7372 r7370 r7369 r7368 r7367 r7366
---
.../Framework/Communications/Capabilities/Caps.cs | 16 +--
.../Framework/Communications/Capabilities/LLSD.cs | 2 +-
.../Communications/Capabilities/LLSDArray.cs | 4 +-
.../Capabilities/LLSDAssetUploadRequest.cs | 2 +-
.../Capabilities/LLSDAssetUploadResponse.cs | 2 +-
.../Communications/Capabilities/LLSDCapEvent.cs | 2 +-
.../Communications/Capabilities/LLSDHelpers.cs | 22 ++--
.../Capabilities/LLSDInventoryItem.cs | 16 +--
.../Communications/Capabilities/LLSDItemUpdate.cs | 2 +-
.../Communications/Capabilities/LLSDMapLayer.cs | 4 +-
.../Capabilities/LLSDMapLayerResponse.cs | 2 +-
.../Capabilities/LLSDParcelVoiceInfoResponse.cs | 2 +-
.../Capabilities/LLSDStreamHandler.cs | 4 +-
.../LLSDTaskInventoryUploadComplete.cs | 2 +-
.../Capabilities/LLSDTaskScriptUpdate.cs | 2 +-
.../Communications/Capabilities/LLSDType.cs | 4 +-
.../Capabilities/LLSDVoiceAccountResponse.cs | 2 +-
OpenSim/Framework/Communications/LoginResponse.cs | 126 ++++++++++-----------
OpenSim/Framework/Communications/LoginService.cs | 8 +-
.../Framework/Communications/UserManagerBase.cs | 2 +-
OpenSim/Framework/Location.cs | 2 +-
OpenSim/Framework/PrimitiveBaseShape.cs | 14 +--
OpenSim/Framework/Servers/BaseHttpServer.cs | 18 +--
OpenSim/Framework/Servers/BaseOpenSimServer.cs | 5 +-
OpenSim/Framework/Servers/LLSDMethod.cs | 4 +-
OpenSim/Framework/Servers/LLSDMethodString.cs | 2 +-
OpenSim/Framework/UserProfileData.cs | 2 +-
OpenSim/Framework/Util.cs | 10 +-
28 files changed, 143 insertions(+), 140 deletions(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index b4a0473..28e56da 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -159,7 +159,7 @@ namespace OpenSim.Framework.Communications.Capabilities
m_capsHandlers["SEED"] = new RestStreamHandler("POST", capsBase + m_requestPath, CapsRequest);
m_log.Warn("[SEED]: " + capsBase + m_requestPath);
//m_capsHandlers["MapLayer"] =
- // new LLSDStreamhandler<OSDMapRequest, OSDMapLayerResponse>("POST",
+ // new LLSDStreamhandler<LLSDMapRequest, LLSDMapLayerResponse>("POST",
// capsBase + m_mapLayerPath,
// GetMapLayer);
m_capsHandlers["NewFileAgentInventory"] =
@@ -297,7 +297,7 @@ namespace OpenSim.Framework.Communications.Capabilities
Hashtable inventoryhash = (Hashtable)foldersrequested[i];
LLSDFetchInventoryDescendents llsdRequest = new LLSDFetchInventoryDescendents();
- LLSDHelpers.DeserialiseOSDMap(inventoryhash, llsdRequest);
+ LLSDHelpers.DeserialiseLLSDMap(inventoryhash, llsdRequest);
LLSDInventoryDescendents reply = FetchInventoryReply(llsdRequest);
inventoryitemstr = LLSDHelpers.SerialiseLLSDReply(reply);
@@ -431,7 +431,7 @@ namespace OpenSim.Framework.Communications.Capabilities
{
m_log.Debug("[CAPS]: MapLayer Request in region: " + m_regionName);
LLSDMapLayerResponse mapResponse = new LLSDMapLayerResponse();
- mapResponse.LayerData.Array.Add(GetOSDMapLayerResponse());
+ mapResponse.LayerData.Array.Add(GetLLSDMapLayerResponse());
return mapResponse;
}
@@ -439,9 +439,9 @@ namespace OpenSim.Framework.Communications.Capabilities
///
/// </summary>
/// <returns></returns>
- protected static OSDMapLayer GetOSDMapLayerResponse()
+ protected static LLSDMapLayer GetLLSDMapLayerResponse()
{
- OSDMapLayer mapLayer = new OSDMapLayer();
+ LLSDMapLayer mapLayer = new LLSDMapLayer();
mapLayer.Right = 5000;
mapLayer.Top = 5000;
mapLayer.ImageID = new UUID("00000000-0000-1111-9999-000000000006");
@@ -545,7 +545,7 @@ namespace OpenSim.Framework.Communications.Capabilities
Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(Utils.StringToBytes(request));
LLSDTaskScriptUpdate llsdUpdateRequest = new LLSDTaskScriptUpdate();
- LLSDHelpers.DeserialiseOSDMap(hash, llsdUpdateRequest);
+ LLSDHelpers.DeserialiseLLSDMap(hash, llsdUpdateRequest);
string capsBase = "/CAPS/" + m_capsObjectPath;
string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000");
@@ -600,10 +600,10 @@ namespace OpenSim.Framework.Communications.Capabilities
OSHttpRequest httpRequest, OSHttpResponse httpResponse)
{
m_log.Debug("[CAPS]: NoteCardAgentInventory Request in region: " + m_regionName);
- //OpenMetaverse.StructuredData.OSDMap hash = (OpenMetaverse.StructuredData.OSDMap)OpenMetaverse.StructuredData.LLSDParser.DeserializeBinary(Utils.StringToBytes(request));
+ //OpenMetaverse.StructuredData.LLSDMap hash = (OpenMetaverse.StructuredData.LLSDMap)OpenMetaverse.StructuredData.LLSDParser.DeserializeBinary(Utils.StringToBytes(request));
Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(Utils.StringToBytes(request));
LLSDItemUpdate llsdRequest = new LLSDItemUpdate();
- LLSDHelpers.DeserialiseOSDMap(hash, llsdRequest);
+ LLSDHelpers.DeserialiseLLSDMap(hash, llsdRequest);
string capsBase = "/CAPS/" + m_capsObjectPath;
string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000");
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSD.cs b/OpenSim/Framework/Communications/Capabilities/LLSD.cs
index e754256..44c4a05 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSD.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSD.cs
@@ -561,7 +561,7 @@ namespace OpenSim.Framework.Communications.Capabilities
endPos = FindEnd(llsd, 1);
if (Double.TryParse(llsd.Substring(1, endPos - 1), NumberStyles.Float,
- Utils.EnUsCulture.NumberFormat, out value))
+ Helpers.EnUsCulture.NumberFormat, out value))
return value;
else
throw new LLSDParseException("Failed to parse double value type");
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDArray.cs b/OpenSim/Framework/Communications/Capabilities/LLSDArray.cs
index 668ca79..3579cc2 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDArray.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDArray.cs
@@ -30,11 +30,11 @@ using System.Collections;
namespace OpenSim.Framework.Communications.Capabilities
{
[LLSDType("ARRAY")]
- public class OSDArray
+ public class LLSDArray
{
public ArrayList Array = new ArrayList();
- public OSDArray()
+ public LLSDArray()
{
}
}
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs
index 16547d5..5833b65 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs
@@ -30,7 +30,7 @@ using OpenMetaverse;
namespace OpenSim.Framework.Communications.Capabilities
{
- [OSDMap]
+ [LLSDMap]
public class LLSDAssetUploadRequest
{
public string asset_type = String.Empty;
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs
index 04e9ed7..63b3351 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs
@@ -29,7 +29,7 @@ using System;
namespace OpenSim.Framework.Communications.Capabilities
{
- [OSDMap]
+ [LLSDMap]
public class LLSDAssetUploadResponse
{
public string uploader = String.Empty;
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDCapEvent.cs b/OpenSim/Framework/Communications/Capabilities/LLSDCapEvent.cs
index d8a6265..5ff21b8 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDCapEvent.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDCapEvent.cs
@@ -31,7 +31,7 @@ namespace OpenSim.Framework.Communications.Capabilities
public class LLSDCapEvent
{
public int id = 0;
- public OSDArray events = new OSDArray();
+ public LLSDArray events = new LLSDArray();
public LLSDCapEvent()
{
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs b/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs
index ae4a3db..b14bfdd 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Framework.Communications.Capabilities
XmlTextWriter writer = new XmlTextWriter(sw);
writer.Formatting = Formatting.None;
writer.WriteStartElement(String.Empty, "llsd", String.Empty);
- SerializeOSDType(writer, obj);
+ SerializeLLSDType(writer, obj);
writer.WriteEndElement();
writer.Close();
@@ -53,7 +53,7 @@ namespace OpenSim.Framework.Communications.Capabilities
return sw.ToString();
}
- private static void SerializeOSDType(XmlTextWriter writer, object obj)
+ private static void SerializeLLSDType(XmlTextWriter writer, object obj)
{
Type myType = obj.GetType();
LLSDType[] llsdattributes = (LLSDType[]) myType.GetCustomAttributes(typeof (LLSDType), false);
@@ -76,7 +76,7 @@ namespace OpenSim.Framework.Communications.Capabilities
fieldName = fieldName.Replace("___", "-");
writer.WriteString(fieldName);
writer.WriteEndElement();
- SerializeOSDType(writer, fieldValue);
+ SerializeLLSDType(writer, fieldValue);
}
else
{
@@ -87,13 +87,13 @@ namespace OpenSim.Framework.Communications.Capabilities
writer.WriteEndElement();
LLSD.LLSDWriteOne(writer, fieldValue);
// OpenMetaverse.StructuredData.LLSDParser.SerializeXmlElement(
- // writer, OpenMetaverse.StructuredData.OSD.FromObject(fieldValue));
+ // writer, OpenMetaverse.StructuredData.LLSD.FromObject(fieldValue));
}
}
writer.WriteEndElement();
break;
case "ARRAY":
- // OSDArray arrayObject = obj as OSDArray;
+ // LLSDArray arrayObject = obj as LLSDArray;
// ArrayList a = arrayObject.Array;
ArrayList a = (ArrayList) obj.GetType().GetField("Array").GetValue(obj);
if (a != null)
@@ -101,7 +101,7 @@ namespace OpenSim.Framework.Communications.Capabilities
writer.WriteStartElement(String.Empty, "array", String.Empty);
foreach (object item in a)
{
- SerializeOSDType(writer, item);
+ SerializeLLSDType(writer, item);
}
writer.WriteEndElement();
}
@@ -112,11 +112,11 @@ namespace OpenSim.Framework.Communications.Capabilities
{
LLSD.LLSDWriteOne(writer, obj);
//OpenMetaverse.StructuredData.LLSDParser.SerializeXmlElement(
- // writer, OpenMetaverse.StructuredData.OSD.FromObject(obj));
+ // writer, OpenMetaverse.StructuredData.LLSD.FromObject(obj));
}
}
- public static object DeserialiseOSDMap(Hashtable llsd, object obj)
+ public static object DeserialiseLLSDMap(Hashtable llsd, object obj)
{
Type myType = obj.GetType();
LLSDType[] llsdattributes = (LLSDType[]) myType.GetCustomAttributes(typeof (LLSDType), false);
@@ -133,12 +133,12 @@ namespace OpenSim.Framework.Communications.Capabilities
FieldInfo field = myType.GetField(keyName);
if (field != null)
{
- // if (enumerator.Value is OpenMetaverse.StructuredData.OSDMap)
+ // if (enumerator.Value is OpenMetaverse.StructuredData.LLSDMap)
if (enumerator.Value is Hashtable)
{
object fieldValue = field.GetValue(obj);
- DeserialiseOSDMap((Hashtable) enumerator.Value, fieldValue);
- // DeserialiseOSDMap((OpenMetaverse.StructuredData.OSDMap) enumerator.Value, fieldValue);
+ DeserialiseLLSDMap((Hashtable) enumerator.Value, fieldValue);
+ // DeserialiseLLSDMap((OpenMetaverse.StructuredData.LLSDMap) enumerator.Value, fieldValue);
}
else if (enumerator.Value is ArrayList)
{
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs b/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs
index 3651513..ff36821 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs
@@ -29,7 +29,7 @@ using OpenMetaverse;
namespace OpenSim.Framework.Communications.Capabilities
{
- [OSDMap]
+ [LLSDMap]
public class LLSDInventoryItem
{
public UUID parent_id;
@@ -47,7 +47,7 @@ namespace OpenSim.Framework.Communications.Capabilities
public int created_at;
}
- [OSDMap]
+ [LLSDMap]
public class LLSDPermissions
{
public UUID creator_id;
@@ -61,20 +61,20 @@ namespace OpenSim.Framework.Communications.Capabilities
public bool is_owner_group;
}
- [OSDMap]
+ [LLSDMap]
public class LLSDSaleInfo
{
public int sale_price;
public string sale_type;
}
- [OSDMap]
+ [LLSDMap]
public class LLSDInventoryDescendents
{
- public OSDArray folders = new OSDArray();
+ public LLSDArray folders = new LLSDArray();
}
- [OSDMap]
+ [LLSDMap]
public class LLSDFetchInventoryDescendents
{
public UUID folder_id;
@@ -84,13 +84,13 @@ namespace OpenSim.Framework.Communications.Capabilities
public bool fetch_items;
}
- [OSDMap]
+ [LLSDMap]
public class LLSDInventoryFolderContents
{
public UUID agent___id; // the (three "_") "___" so the serialising knows to change this to a "-"
public int descendents;
public UUID folder___id; //as LL can't decide if they are going to use "_" or "-" to separate words in the field names
- public OSDArray items = new OSDArray();
+ public LLSDArray items = new LLSDArray();
public UUID owner___id; // and of course we can't have field names with "-" in
public int version;
}
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDItemUpdate.cs b/OpenSim/Framework/Communications/Capabilities/LLSDItemUpdate.cs
index 4568732..c147bd3 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDItemUpdate.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDItemUpdate.cs
@@ -29,7 +29,7 @@ using OpenMetaverse;
namespace OpenSim.Framework.Communications.Capabilities
{
- [OSDMap]
+ [LLSDMap]
public class LLSDItemUpdate
{
public UUID item_id;
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDMapLayer.cs b/OpenSim/Framework/Communications/Capabilities/LLSDMapLayer.cs
index 356fa5e..fc381e4 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDMapLayer.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDMapLayer.cs
@@ -30,7 +30,7 @@ using OpenMetaverse;
namespace OpenSim.Framework.Communications.Capabilities
{
[LLSDType("MAP")]
- public class OSDMapLayer
+ public class LLSDMapLayer
{
public int Left = 0;
public int Right = 0;
@@ -38,7 +38,7 @@ namespace OpenSim.Framework.Communications.Capabilities
public int Bottom = 0;
public UUID ImageID = UUID.Zero;
- public OSDMapLayer()
+ public LLSDMapLayer()
{
}
}
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDMapLayerResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDMapLayerResponse.cs
index 26815f9..7dabbec 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDMapLayerResponse.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDMapLayerResponse.cs
@@ -31,7 +31,7 @@ namespace OpenSim.Framework.Communications.Capabilities
public class LLSDMapLayerResponse
{
public LLSDMapRequest AgentData = new LLSDMapRequest();
- public OSDArray LayerData = new OSDArray();
+ public LLSDArray LayerData = new LLSDArray();
public LLSDMapLayerResponse()
{
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs
index 829a2a9..c045dcf 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs
@@ -30,7 +30,7 @@ using System.Collections;
namespace OpenSim.Framework.Communications.Capabilities
{
- [OSDMap]
+ [LLSDMap]
public class LLSDParcelVoiceInfoResponse
{
public int parcel_local_id;
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs b/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
index c68a205..7fcbb81 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
@@ -53,12 +53,12 @@ namespace OpenSim.Framework.Communications.Capabilities
//string requestBody = streamReader.ReadToEnd();
//streamReader.Close();
- // OpenMetaverse.StructuredData.OSDMap hash = (OpenMetaverse.StructuredData.OSDMap)
+ // OpenMetaverse.StructuredData.LLSDMap hash = (OpenMetaverse.StructuredData.LLSDMap)
// OpenMetaverse.StructuredData.LLSDParser.DeserializeXml(new XmlTextReader(request));
Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(request);
TRequest llsdRequest = new TRequest();
- LLSDHelpers.DeserialiseOSDMap(hash, llsdRequest);
+ LLSDHelpers.DeserialiseLLSDMap(hash, llsdRequest);
TResponse response = m_method(llsdRequest);
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDTaskInventoryUploadComplete.cs b/OpenSim/Framework/Communications/Capabilities/LLSDTaskInventoryUploadComplete.cs
index bcea657..b34cbf9 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDTaskInventoryUploadComplete.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDTaskInventoryUploadComplete.cs
@@ -29,7 +29,7 @@ using OpenMetaverse;
namespace OpenSim.Framework.Communications.Capabilities
{
- [OSDMap]
+ [LLSDMap]
public class LLSDTaskInventoryUploadComplete
{
/// <summary>
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDTaskScriptUpdate.cs b/OpenSim/Framework/Communications/Capabilities/LLSDTaskScriptUpdate.cs
index 7401768..730e95b 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDTaskScriptUpdate.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDTaskScriptUpdate.cs
@@ -29,7 +29,7 @@ using OpenMetaverse;
namespace OpenSim.Framework.Communications.Capabilities
{
- [OSDMap]
+ [LLSDMap]
public class LLSDTaskScriptUpdate
{
/// <summary>
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDType.cs b/OpenSim/Framework/Communications/Capabilities/LLSDType.cs
index 949e119..181a465 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDType.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDType.cs
@@ -46,9 +46,9 @@ namespace OpenSim.Framework.Communications.Capabilities
}
[AttributeUsage(AttributeTargets.Class)]
- public class OSDMap : LLSDType
+ public class LLSDMap : LLSDType
{
- public OSDMap() : base("MAP")
+ public LLSDMap() : base("MAP")
{
}
}
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs
index 6cd5ee3..8143233 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs
@@ -28,7 +28,7 @@
namespace OpenSim.Framework.Communications.Capabilities
{
- [OSDMap]
+ [LLSDMap]
public class LLSDVoiceAccountResponse
{
public string username;
diff --git a/OpenSim/Framework/Communications/LoginResponse.cs b/OpenSim/Framework/Communications/LoginResponse.cs
index 867e9e6..b2565b1 100644
--- a/OpenSim/Framework/Communications/LoginResponse.cs
+++ b/OpenSim/Framework/Communications/LoginResponse.cs
@@ -201,17 +201,17 @@ namespace OpenSim.Framework.Communications
return (xmlRpcResponse);
}
- public OSD GenerateFailureResponseLLSD(string reason, string message, string login)
+ public LLSD GenerateFailureResponseLLSD(string reason, string message, string login)
{
- OSDMap map = new OSDMap();
+ LLSDMap map = new LLSDMap();
// Ensure Login Failed message/reason;
ErrorMessage = message;
ErrorReason = reason;
- map["reason"] = OSD.FromString(ErrorReason);
- map["message"] = OSD.FromString(ErrorMessage);
- map["login"] = OSD.FromString(login);
+ map["reason"] = LLSD.FromString(ErrorReason);
+ map["message"] = LLSD.FromString(ErrorMessage);
+ map["login"] = LLSD.FromString(login);
return map;
}
@@ -221,7 +221,7 @@ namespace OpenSim.Framework.Communications
return (CreateLoginFailedResponse());
}
- public OSD CreateFailedResponseLLSD()
+ public LLSD CreateFailedResponseLLSD()
{
return CreateLoginFailedResponseLLSD();
}
@@ -234,7 +234,7 @@ namespace OpenSim.Framework.Communications
"false"));
}
- public OSD CreateLoginFailedResponseLLSD()
+ public LLSD CreateLoginFailedResponseLLSD()
{
return GenerateFailureResponseLLSD(
"key",
@@ -265,7 +265,7 @@ namespace OpenSim.Framework.Communications
"false"));
}
- public OSD CreateAlreadyLoggedInResponseLLSD()
+ public LLSD CreateAlreadyLoggedInResponseLLSD()
{
return GenerateFailureResponseLLSD(
"presence",
@@ -283,7 +283,7 @@ namespace OpenSim.Framework.Communications
"false"));
}
- public OSD CreateLoginBlockedResponseLLSD()
+ public LLSD CreateLoginBlockedResponseLLSD()
{
return GenerateFailureResponseLLSD(
"presence",
@@ -299,7 +299,7 @@ namespace OpenSim.Framework.Communications
"false"));
}
- public OSD CreateDeadRegionResponseLLSD()
+ public LLSD CreateDeadRegionResponseLLSD()
{
return GenerateFailureResponseLLSD(
"key",
@@ -315,7 +315,7 @@ namespace OpenSim.Framework.Communications
"false"));
}
- public OSD CreateGridErrorResponseLLSD()
+ public LLSD CreateGridErrorResponseLLSD()
{
return GenerateFailureResponseLLSD(
"key",
@@ -404,90 +404,90 @@ namespace OpenSim.Framework.Communications
}
}
- public OSD ToLLSDResponse()
+ public LLSD ToLLSDResponse()
{
try
{
- OSDMap map = new OSDMap();
+ LLSDMap map = new LLSDMap();
- map["first_name"] = OSD.FromString(Firstname);
- map["last_name"] = OSD.FromString(Lastname);
- map["agent_access"] = OSD.FromString(agentAccess);
+ map["first_name"] = LLSD.FromString(Firstname);
+ map["last_name"] = LLSD.FromString(Lastname);
+ map["agent_access"] = LLSD.FromString(agentAccess);
- map["sim_port"] = OSD.FromInteger(SimPort);
- map["sim_ip"] = OSD.FromString(SimAddress);
+ map["sim_port"] = LLSD.FromInteger(SimPort);
+ map["sim_ip"] = LLSD.FromString(SimAddress);
- map["agent_id"] = OSD.FromUUID(AgentID);
- map["session_id"] = OSD.FromUUID(SessionID);
- map["secure_session_id"] = OSD.FromUUID(SecureSessionID);
- map["circuit_code"] = OSD.FromInteger(CircuitCode);
- map["seconds_since_epoch"] = OSD.FromInteger((int)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds);
+ map["agent_id"] = LLSD.FromUUID(AgentID);
+ map["session_id"] = LLSD.FromUUID(SessionID);
+ map["secure_session_id"] = LLSD.FromUUID(SecureSessionID);
+ map["circuit_code"] = LLSD.FromInteger(CircuitCode);
+ map["seconds_since_epoch"] = LLSD.FromInteger((int)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds);
#region Login Flags
- OSDMap loginFlagsLLSD = new OSDMap();
- loginFlagsLLSD["daylight_savings"] = OSD.FromString(DST);
- loginFlagsLLSD["stipend_since_login"] = OSD.FromString(StipendSinceLogin);
- loginFlagsLLSD["gendered"] = OSD.FromString(Gendered);
- loginFlagsLLSD["ever_logged_in"] = OSD.FromString(EverLoggedIn);
- map["login-flags"] = WrapOSDMap(loginFlagsLLSD);
+ LLSDMap loginFlagsLLSD = new LLSDMap();
+ loginFlagsLLSD["daylight_savings"] = LLSD.FromString(DST);
+ loginFlagsLLSD["stipend_since_login"] = LLSD.FromString(StipendSinceLogin);
+ loginFlagsLLSD["gendered"] = LLSD.FromString(Gendered);
+ loginFlagsLLSD["ever_logged_in"] = LLSD.FromString(EverLoggedIn);
+ map["login-flags"] = WrapLLSDMap(loginFlagsLLSD);
#endregion Login Flags
#region Global Textures
- OSDMap globalTexturesLLSD = new OSDMap();
- globalTexturesLLSD["sun_texture_id"] = OSD.FromString(SunTexture);
- globalTexturesLLSD["cloud_texture_id"] = OSD.FromString(CloudTexture);
- globalTexturesLLSD["moon_texture_id"] = OSD.FromString(MoonTexture);
+ LLSDMap globalTexturesLLSD = new LLSDMap();
+ globalTexturesLLSD["sun_texture_id"] = LLSD.FromString(SunTexture);
+ globalTexturesLLSD["cloud_texture_id"] = LLSD.FromString(CloudTexture);
+ globalTexturesLLSD["moon_texture_id"] = LLSD.FromString(MoonTexture);
- map["global-textures"] = WrapOSDMap(globalTexturesLLSD);
+ map["global-textures"] = WrapLLSDMap(globalTexturesLLSD);
#endregion Global Textures
- map["seed_capability"] = OSD.FromString(seedCapability);
+ map["seed_capability"] = LLSD.FromString(seedCapability);
- map["event_categories"] = ArrayListToOSDArray(eventCategories);
- //map["event_notifications"] = new OSDArray(); // todo
- map["classified_categories"] = ArrayListToOSDArray(classifiedCategories);
+ map["event_categories"] = ArrayListToLLSDArray(eventCategories);
+ //map["event_notifications"] = new LLSDArray(); // todo
+ map["classified_categories"] = ArrayListToLLSDArray(classifiedCategories);
#region UI Config
- OSDMap uiConfigLLSD = new OSDMap();
- uiConfigLLSD["allow_first_life"] = OSD.FromString(allowFirstLife);
- map["ui-config"] = WrapOSDMap(uiConfigLLSD);
+ LLSDMap uiConfigLLSD = new LLSDMap();
+ uiConfigLLSD["allow_first_life"] = LLSD.FromString(allowFirstLife);
+ map["ui-config"] = WrapLLSDMap(uiConfigLLSD);
#endregion UI Config
#region Inventory
- map["inventory-skeleton"] = ArrayListToOSDArray(agentInventory);
+ map["inventory-skeleton"] = ArrayListToLLSDArray(agentInventory);
- map["inventory-skel-lib"] = ArrayListToOSDArray(inventoryLibrary);
- map["inventory-root"] = ArrayListToOSDArray(inventoryRoot); ;
- map["inventory-lib-root"] = ArrayListToOSDArray(inventoryLibRoot);
- map["inventory-lib-owner"] = ArrayListToOSDArray(inventoryLibraryOwner);
+ map["inventory-skel-lib"] = ArrayListToLLSDArray(inventoryLibrary);
+ map["inventory-root"] = ArrayListToLLSDArray(inventoryRoot); ;
+ map["inventory-lib-root"] = ArrayListToLLSDArray(inventoryLibRoot);
+ map["inventory-lib-owner"] = ArrayListToLLSDArray(inventoryLibraryOwner);
#endregion Inventory
- map["gestures"] = ArrayListToOSDArray(activeGestures);
+ map["gestures"] = ArrayListToLLSDArray(activeGestures);
- map["initial-outfit"] = ArrayListToOSDArray(initialOutfit);
- map["start_location"] = OSD.FromString(startLocation);
+ map["initial-outfit"] = ArrayListToLLSDArray(initialOutfit);
+ map["start_location"] = LLSD.FromString(startLocation);
- map["seed_capability"] = OSD.FromString(seedCapability);
- map["home"] = OSD.FromString(home);
- map["look_at"] = OSD.FromString(lookAt);
- map["message"] = OSD.FromString(welcomeMessage);
- map["region_x"] = OSD.FromInteger(RegionX * Constants.RegionSize);
- map["region_y"] = OSD.FromInteger(RegionY * Constants.RegionSize);
+ map["seed_capability"] = LLSD.FromString(seedCapability);
+ map["home"] = LLSD.FromString(home);
+ map["look_at"] = LLSD.FromString(lookAt);
+ map["message"] = LLSD.FromString(welcomeMessage);
+ map["region_x"] = LLSD.FromInteger(RegionX * Constants.RegionSize);
+ map["region_y"] = LLSD.FromInteger(RegionY * Constants.RegionSize);
if (m_buddyList != null)
{
- map["buddy-list"] = ArrayListToOSDArray(m_buddyList.ToArray());
+ map["buddy-list"] = ArrayListToLLSDArray(m_buddyList.ToArray());
}
- map["login"] = OSD.FromString("true");
+ map["login"] = LLSD.FromString("true");
return map;
}
@@ -499,24 +499,24 @@ namespace OpenSim.Framework.Communications
}
}
- public OSDArray ArrayListToOSDArray(ArrayList arrlst)
+ public LLSDArray ArrayListToLLSDArray(ArrayList arrlst)
{
- OSDArray llsdBack = new OSDArray();
+ LLSDArray llsdBack = new LLSDArray();
foreach (Hashtable ht in arrlst)
{
- OSDMap mp = new OSDMap();
+ LLSDMap mp = new LLSDMap();
foreach (DictionaryEntry deHt in ht)
{
- mp.Add((string)deHt.Key, OSDString.FromObject(deHt.Value));
+ mp.Add((string)deHt.Key, LLSDString.FromObject(deHt.Value));
}
llsdBack.Add(mp);
}
return llsdBack;
}
- private static OSDArray WrapOSDMap(OSDMap wrapMe)
+ private static LLSDArray WrapLLSDMap(LLSDMap wrapMe)
{
- OSDArray array = new OSDArray();
+ LLSDArray array = new LLSDArray();
array.Add(wrapMe);
return array;
}
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index b4ee069..7fd1c3b 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -321,7 +321,7 @@ namespace OpenSim.Framework.Communications
/// </summary>
/// <param name="request">The LLSD request</param>
/// <returns>The response to send</returns>
- public OSD LLSDLoginMethod(OSD request)
+ public LLSD LLSDLoginMethod(LLSD request)
{
// Temporary fix
m_loginMutex.WaitOne();
@@ -335,9 +335,9 @@ namespace OpenSim.Framework.Communications
UserProfileData userProfile = null;
LoginResponse logResponse = new LoginResponse();
- if (request.Type == OSDType.Map)
+ if (request.Type == LLSDType.Map)
{
- OSDMap map = (OSDMap)request;
+ LLSDMap map = (LLSDMap)request;
if (map.ContainsKey("first") && map.ContainsKey("last") && map.ContainsKey("passwd"))
{
@@ -749,7 +749,7 @@ namespace OpenSim.Framework.Communications
m_userManager.CreateAgent(profile, request);
}
- public void CreateAgent(UserProfileData profile, OSD request)
+ public void CreateAgent(UserProfileData profile, LLSD request)
{
m_userManager.CreateAgent(profile, request);
}
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index 4b5d2bb..7189eee 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -448,7 +448,7 @@ namespace OpenSim.Framework.Communications
profile.CurrentAgent = agent;
}
- public void CreateAgent(UserProfileData profile, OSD request)
+ public void CreateAgent(UserProfileData profile, LLSD request)
{
UserAgentData agent = new UserAgentData();
diff --git a/OpenSim/Framework/Location.cs b/OpenSim/Framework/Location.cs
index aed2b87..f67543a 100644
--- a/OpenSim/Framework/Location.cs
+++ b/OpenSim/Framework/Location.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Framework
public ulong RegionHandle
{
- get { return Utils.UIntsToLong((uint)m_x, (uint)m_y); }
+ get { return Helpers.UIntsToLong((uint) m_x, (uint) m_y); }
}
public int X
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index adb55aa..cd50e9e 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -874,7 +874,7 @@ namespace OpenSim.Framework
for (int k = 0; k < extraParamCount; k++)
{
- ushort epType = Utils.BytesToUInt16(data, i);
+ ushort epType = Helpers.BytesToUInt16(data, i);
i += 2;
// uint paramLength = Helpers.BytesToUIntBig(data, i);
@@ -1014,9 +1014,9 @@ namespace OpenSim.Framework
_lightColorG = lColor.G;
_lightColorB = lColor.B;
- _lightRadius = Utils.BytesToFloat(data, pos + 4);
- _lightCutoff = Utils.BytesToFloat(data, pos + 8);
- _lightFalloff = Utils.BytesToFloat(data, pos + 12);
+ _lightRadius = Helpers.BytesToFloat(data, pos + 4);
+ _lightCutoff = Helpers.BytesToFloat(data, pos + 8);
+ _lightFalloff = Helpers.BytesToFloat(data, pos + 12);
}
else
{
@@ -1040,9 +1040,9 @@ namespace OpenSim.Framework
Color4 tmpColor = new Color4(_lightColorR,_lightColorG,_lightColorB,_lightIntensity);
tmpColor.GetBytes().CopyTo(data, 0);
- Utils.FloatToBytes(_lightRadius).CopyTo(data, 4);
- Utils.FloatToBytes(_lightCutoff).CopyTo(data, 8);
- Utils.FloatToBytes(_lightFalloff).CopyTo(data, 12);
+ Helpers.FloatToBytes(_lightRadius).CopyTo(data, 4);
+ Helpers.FloatToBytes(_lightCutoff).CopyTo(data, 8);
+ Helpers.FloatToBytes(_lightFalloff).CopyTo(data, 12);
return data;
}
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index 0724e8c..1a54d60 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -692,8 +692,8 @@ namespace OpenSim.Framework.Servers
//m_log.DebugFormat("[OGP]: {0}:{1}", request.RawUrl, requestBody);
response.KeepAlive = true;
- OSD llsdRequest = null;
- OSD llsdResponse = null;
+ LLSD llsdRequest = null;
+ LLSD llsdResponse = null;
bool LegacyLLSDLoginLibOMV = (requestBody.Contains("passwd") && requestBody.Contains("mac") && requestBody.Contains("viewer_digest"));
@@ -704,7 +704,7 @@ namespace OpenSim.Framework.Servers
}
try
{
- llsdRequest = OSDParser.DeserializeLLSDXml(requestBody);
+ llsdRequest = LLSDParser.DeserializeXml(requestBody);
}
catch (Exception ex)
{
@@ -756,7 +756,7 @@ namespace OpenSim.Framework.Servers
{
response.ContentType = "application/llsd+xml";
//m_log.Info("[Debug BASE HTTP SERVER]: Response: " + llsdResponse.ToString());
- buffer = OSDParser.SerializeLLSDXmlBytes(llsdResponse);
+ buffer = LLSDParser.SerializeXmlBytes(llsdResponse);
}
response.SendChunked = false;
response.ContentLength64 = buffer.Length;
@@ -948,12 +948,12 @@ namespace OpenSim.Framework.Servers
}
}
- private OSDMap GenerateNoLLSDHandlerResponse()
+ private LLSDMap GenerateNoLLSDHandlerResponse()
{
- OSDMap map = new OSDMap();
- map["reason"] = OSD.FromString("LLSDRequest");
- map["message"] = OSD.FromString("No handler registered for LLSD Requests");
- map["login"] = OSD.FromString("false");
+ LLSDMap map = new LLSDMap();
+ map["reason"] = LLSD.FromString("LLSDRequest");
+ map["message"] = LLSD.FromString("No handler registered for LLSD Requests");
+ map["login"] = LLSD.FromString("false");
return map;
}
/// <summary>
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 302640b..1281335 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -341,7 +341,8 @@ namespace OpenSim.Framework.Servers
public virtual void Show(string[] showParams)
{
switch (showParams[0])
- {
+ {
+
case "info":
Notice("Version: " + m_version);
Notice("Startup directory: " + m_startupDirectory);
@@ -349,7 +350,9 @@ namespace OpenSim.Framework.Servers
case "stats":
if (m_stats != null)
+ {
Notice(m_stats.Report());
+ }
break;
case "threads":
diff --git a/OpenSim/Framework/Servers/LLSDMethod.cs b/OpenSim/Framework/Servers/LLSDMethod.cs
index 693d298..6a39544 100644
--- a/OpenSim/Framework/Servers/LLSDMethod.cs
+++ b/OpenSim/Framework/Servers/LLSDMethod.cs
@@ -29,6 +29,6 @@ using OpenMetaverse.StructuredData;
namespace OpenSim.Framework.Servers
{
- public delegate OSD LLSDMethod( string path, OSD request, string endpoint );
- public delegate OSD DefaultLLSDMethod(OSD request);
+ public delegate LLSD LLSDMethod( string path, LLSD request, string endpoint );
+ public delegate LLSD DefaultLLSDMethod(LLSD request);
}
diff --git a/OpenSim/Framework/Servers/LLSDMethodString.cs b/OpenSim/Framework/Servers/LLSDMethodString.cs
index 77fc290..e15b621 100644
--- a/OpenSim/Framework/Servers/LLSDMethodString.cs
+++ b/OpenSim/Framework/Servers/LLSDMethodString.cs
@@ -29,5 +29,5 @@ using OpenMetaverse.StructuredData;
namespace OpenSim.Framework.Servers
{
- public delegate OSD LLSDMethodString(OSD request, string thePath);
+ public delegate LLSD LLSDMethodString(LLSD request, string thePath);
}
diff --git a/OpenSim/Framework/UserProfileData.cs b/OpenSim/Framework/UserProfileData.cs
index b6f309d..d12ad40 100644
--- a/OpenSim/Framework/UserProfileData.cs
+++ b/OpenSim/Framework/UserProfileData.cs
@@ -156,7 +156,7 @@ namespace OpenSim.Framework
/// </summary>
public virtual ulong HomeRegion
{
- get { return Utils.UIntsToLong((_homeRegionX * (uint)Constants.RegionSize), (_homeRegionY * (uint)Constants.RegionSize)); }
+ get { return Helpers.UIntsToLong((_homeRegionX * (uint) Constants.RegionSize), (_homeRegionY * (uint) Constants.RegionSize)); }
set
{
_homeRegionX = (uint) (value >> 40);
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index f0ad1d5..f72797f 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -185,7 +185,7 @@ namespace OpenSim.Framework
public static ulong UIntsToLong(uint X, uint Y)
{
- return Utils.UIntsToLong(X, Y);
+ return Helpers.UIntsToLong(X, Y);
}
public static T Clamp<T>(T x, T min, T max)
@@ -783,9 +783,9 @@ namespace OpenSim.Framework
public static void ParseFakeParcelID(UUID parcelID, out ulong regionHandle, out uint x, out uint y)
{
byte[] bytes = parcelID.GetBytes();
- regionHandle = Utils.BytesToUInt64(bytes);
- x = Utils.BytesToUInt(bytes, 8);
- y = Utils.BytesToUInt(bytes, 12);
+ regionHandle = Helpers.BytesToUInt64(bytes);
+ x = Helpers.BytesToUInt(bytes, 8);
+ y = Helpers.BytesToUInt(bytes, 12);
}
public static void FakeParcelIDToGlobalPosition(UUID parcelID, out uint x, out uint y)
@@ -794,7 +794,7 @@ namespace OpenSim.Framework
uint rx, ry;
ParseFakeParcelID(parcelID, out regionHandle, out x, out y);
- Utils.LongToUInts(regionHandle, out rx, out ry);
+ Helpers.LongToUInts(regionHandle, out rx, out ry);
x += rx;
y += ry;
--
cgit v1.1