OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
0.6.1-post-fixes
Melanie Thielker 2008-11-19 06:15:21 +00:00
parent 44a94055a4
commit 3234472d62
73 changed files with 589 additions and 705 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Data/RegionProfileData.cs
View File

@ -153,7 +153,7 @@ namespace OpenSim.Data
simData.regionLocX = Convert.ToUInt32((string) responseData["region_locx"]); simData.regionLocX = Convert.ToUInt32((string) responseData["region_locx"]);
simData.regionLocY = Convert.ToUInt32((string) responseData["region_locy"]); simData.regionLocY = Convert.ToUInt32((string) responseData["region_locy"]);
simData.regionHandle = simData.regionHandle =
Utils.UIntsToLong((simData.regionLocX * Constants.RegionSize), Helpers.UIntsToLong((simData.regionLocX*Constants.RegionSize),
(simData.regionLocY*Constants.RegionSize)); (simData.regionLocY*Constants.RegionSize));
simData.serverIP = (string) responseData["sim_ip"]; simData.serverIP = (string) responseData["sim_ip"];
simData.serverPort = Convert.ToUInt32((string) responseData["sim_port"]); simData.serverPort = Convert.ToUInt32((string) responseData["sim_port"]);

16
OpenSim/Framework/Communications/Capabilities/Caps.cs
View File

@ -159,7 +159,7 @@ namespace OpenSim.Framework.Communications.Capabilities
m_capsHandlers["SEED"] = new RestStreamHandler("POST", capsBase + m_requestPath, CapsRequest); m_capsHandlers["SEED"] = new RestStreamHandler("POST", capsBase + m_requestPath, CapsRequest);
m_log.Warn("[SEED]: " + capsBase + m_requestPath); m_log.Warn("[SEED]: " + capsBase + m_requestPath);
//m_capsHandlers["MapLayer"] = //m_capsHandlers["MapLayer"] =
// new LLSDStreamhandler<OSDMapRequest, OSDMapLayerResponse>("POST", // new LLSDStreamhandler<LLSDMapRequest, LLSDMapLayerResponse>("POST",
// capsBase + m_mapLayerPath, // capsBase + m_mapLayerPath,
// GetMapLayer); // GetMapLayer);
m_capsHandlers["NewFileAgentInventory"] = m_capsHandlers["NewFileAgentInventory"] =
@ -297,7 +297,7 @@ namespace OpenSim.Framework.Communications.Capabilities
Hashtable inventoryhash = (Hashtable)foldersrequested[i]; Hashtable inventoryhash = (Hashtable)foldersrequested[i];
LLSDFetchInventoryDescendents llsdRequest = new LLSDFetchInventoryDescendents(); LLSDFetchInventoryDescendents llsdRequest = new LLSDFetchInventoryDescendents();
LLSDHelpers.DeserialiseOSDMap(inventoryhash, llsdRequest); LLSDHelpers.DeserialiseLLSDMap(inventoryhash, llsdRequest);
LLSDInventoryDescendents reply = FetchInventoryReply(llsdRequest); LLSDInventoryDescendents reply = FetchInventoryReply(llsdRequest);
inventoryitemstr = LLSDHelpers.SerialiseLLSDReply(reply); inventoryitemstr = LLSDHelpers.SerialiseLLSDReply(reply);
@ -431,7 +431,7 @@ namespace OpenSim.Framework.Communications.Capabilities
{ {
m_log.Debug("[CAPS]: MapLayer Request in region: " + m_regionName); m_log.Debug("[CAPS]: MapLayer Request in region: " + m_regionName);
LLSDMapLayerResponse mapResponse = new LLSDMapLayerResponse(); LLSDMapLayerResponse mapResponse = new LLSDMapLayerResponse();
mapResponse.LayerData.Array.Add(GetOSDMapLayerResponse()); mapResponse.LayerData.Array.Add(GetLLSDMapLayerResponse());
return mapResponse; return mapResponse;
} }
@ -439,9 +439,9 @@ namespace OpenSim.Framework.Communications.Capabilities
/// ///
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
protected static OSDMapLayer GetOSDMapLayerResponse() protected static LLSDMapLayer GetLLSDMapLayerResponse()
{ {
OSDMapLayer mapLayer = new OSDMapLayer(); LLSDMapLayer mapLayer = new LLSDMapLayer();
mapLayer.Right = 5000; mapLayer.Right = 5000;
mapLayer.Top = 5000; mapLayer.Top = 5000;
mapLayer.ImageID = new UUID("00000000-0000-1111-9999-000000000006"); 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)); Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(Utils.StringToBytes(request));
LLSDTaskScriptUpdate llsdUpdateRequest = new LLSDTaskScriptUpdate(); LLSDTaskScriptUpdate llsdUpdateRequest = new LLSDTaskScriptUpdate();
LLSDHelpers.DeserialiseOSDMap(hash, llsdUpdateRequest); LLSDHelpers.DeserialiseLLSDMap(hash, llsdUpdateRequest);
string capsBase = "/CAPS/" + m_capsObjectPath; string capsBase = "/CAPS/" + m_capsObjectPath;
string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000"); string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000");
@ -600,10 +600,10 @@ namespace OpenSim.Framework.Communications.Capabilities
OSHttpRequest httpRequest, OSHttpResponse httpResponse) OSHttpRequest httpRequest, OSHttpResponse httpResponse)
{ {
m_log.Debug("[CAPS]: NoteCardAgentInventory Request in region: " + m_regionName); 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)); Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(Utils.StringToBytes(request));
LLSDItemUpdate llsdRequest = new LLSDItemUpdate(); LLSDItemUpdate llsdRequest = new LLSDItemUpdate();
LLSDHelpers.DeserialiseOSDMap(hash, llsdRequest); LLSDHelpers.DeserialiseLLSDMap(hash, llsdRequest);
string capsBase = "/CAPS/" + m_capsObjectPath; string capsBase = "/CAPS/" + m_capsObjectPath;
string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000"); string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000");

2
OpenSim/Framework/Communications/Capabilities/LLSD.cs
View File

@ -561,7 +561,7 @@ namespace OpenSim.Framework.Communications.Capabilities
endPos = FindEnd(llsd, 1); endPos = FindEnd(llsd, 1);
if (Double.TryParse(llsd.Substring(1, endPos - 1), NumberStyles.Float, if (Double.TryParse(llsd.Substring(1, endPos - 1), NumberStyles.Float,
Utils.EnUsCulture.NumberFormat, out value)) Helpers.EnUsCulture.NumberFormat, out value))
return value; return value;
else else
throw new LLSDParseException("Failed to parse double value type"); throw new LLSDParseException("Failed to parse double value type");

4
OpenSim/Framework/Communications/Capabilities/LLSDArray.cs
View File

@ -30,11 +30,11 @@ using System.Collections;
namespace OpenSim.Framework.Communications.Capabilities namespace OpenSim.Framework.Communications.Capabilities
{ {
[LLSDType("ARRAY")] [LLSDType("ARRAY")]
public class OSDArray public class LLSDArray
{ {
public ArrayList Array = new ArrayList(); public ArrayList Array = new ArrayList();
public OSDArray() public LLSDArray()
{ {
} }
} }

2
OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs
View File

@ -30,7 +30,7 @@ using OpenMetaverse;
namespace OpenSim.Framework.Communications.Capabilities namespace OpenSim.Framework.Communications.Capabilities
{ {
[OSDMap] [LLSDMap]
public class LLSDAssetUploadRequest public class LLSDAssetUploadRequest
{ {
public string asset_type = String.Empty; public string asset_type = String.Empty;

2
OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs
View File

@ -29,7 +29,7 @@ using System;
namespace OpenSim.Framework.Communications.Capabilities namespace OpenSim.Framework.Communications.Capabilities
{ {
[OSDMap] [LLSDMap]
public class LLSDAssetUploadResponse public class LLSDAssetUploadResponse
{ {
public string uploader = String.Empty; public string uploader = String.Empty;

2
OpenSim/Framework/Communications/Capabilities/LLSDCapEvent.cs
View File

@ -31,7 +31,7 @@ namespace OpenSim.Framework.Communications.Capabilities
public class LLSDCapEvent public class LLSDCapEvent
{ {
public int id = 0; public int id = 0;
public OSDArray events = new OSDArray(); public LLSDArray events = new LLSDArray();
public LLSDCapEvent() public LLSDCapEvent()
{ {

22
OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs
View File

@ -44,7 +44,7 @@ namespace OpenSim.Framework.Communications.Capabilities
XmlTextWriter writer = new XmlTextWriter(sw); XmlTextWriter writer = new XmlTextWriter(sw);
writer.Formatting = Formatting.None; writer.Formatting = Formatting.None;
writer.WriteStartElement(String.Empty, "llsd", String.Empty); writer.WriteStartElement(String.Empty, "llsd", String.Empty);
SerializeOSDType(writer, obj); SerializeLLSDType(writer, obj);
writer.WriteEndElement(); writer.WriteEndElement();
writer.Close(); writer.Close();
@ -53,7 +53,7 @@ namespace OpenSim.Framework.Communications.Capabilities
return sw.ToString(); return sw.ToString();
} }
private static void SerializeOSDType(XmlTextWriter writer, object obj) private static void SerializeLLSDType(XmlTextWriter writer, object obj)
{ {
Type myType = obj.GetType(); Type myType = obj.GetType();
LLSDType[] llsdattributes = (LLSDType[]) myType.GetCustomAttributes(typeof (LLSDType), false); LLSDType[] llsdattributes = (LLSDType[]) myType.GetCustomAttributes(typeof (LLSDType), false);
@ -76,7 +76,7 @@ namespace OpenSim.Framework.Communications.Capabilities
fieldName = fieldName.Replace("___", "-"); fieldName = fieldName.Replace("___", "-");
writer.WriteString(fieldName); writer.WriteString(fieldName);
writer.WriteEndElement(); writer.WriteEndElement();
SerializeOSDType(writer, fieldValue); SerializeLLSDType(writer, fieldValue);
} }
else else
{ {
@ -87,13 +87,13 @@ namespace OpenSim.Framework.Communications.Capabilities
writer.WriteEndElement(); writer.WriteEndElement();
LLSD.LLSDWriteOne(writer, fieldValue); LLSD.LLSDWriteOne(writer, fieldValue);
// OpenMetaverse.StructuredData.LLSDParser.SerializeXmlElement( // OpenMetaverse.StructuredData.LLSDParser.SerializeXmlElement(
// writer, OpenMetaverse.StructuredData.OSD.FromObject(fieldValue)); // writer, OpenMetaverse.StructuredData.LLSD.FromObject(fieldValue));
} }
} }
writer.WriteEndElement(); writer.WriteEndElement();
break; break;
case "ARRAY": case "ARRAY":
// OSDArray arrayObject = obj as OSDArray; // LLSDArray arrayObject = obj as LLSDArray;
// ArrayList a = arrayObject.Array; // ArrayList a = arrayObject.Array;
ArrayList a = (ArrayList) obj.GetType().GetField("Array").GetValue(obj); ArrayList a = (ArrayList) obj.GetType().GetField("Array").GetValue(obj);
if (a != null) if (a != null)
@ -101,7 +101,7 @@ namespace OpenSim.Framework.Communications.Capabilities
writer.WriteStartElement(String.Empty, "array", String.Empty); writer.WriteStartElement(String.Empty, "array", String.Empty);
foreach (object item in a) foreach (object item in a)
{ {
SerializeOSDType(writer, item); SerializeLLSDType(writer, item);
} }
writer.WriteEndElement(); writer.WriteEndElement();
} }
@ -112,11 +112,11 @@ namespace OpenSim.Framework.Communications.Capabilities
{ {
LLSD.LLSDWriteOne(writer, obj); LLSD.LLSDWriteOne(writer, obj);
//OpenMetaverse.StructuredData.LLSDParser.SerializeXmlElement( //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(); Type myType = obj.GetType();
LLSDType[] llsdattributes = (LLSDType[]) myType.GetCustomAttributes(typeof (LLSDType), false); LLSDType[] llsdattributes = (LLSDType[]) myType.GetCustomAttributes(typeof (LLSDType), false);
@ -133,12 +133,12 @@ namespace OpenSim.Framework.Communications.Capabilities
FieldInfo field = myType.GetField(keyName); FieldInfo field = myType.GetField(keyName);
if (field != null) if (field != null)
{ {
// if (enumerator.Value is OpenMetaverse.StructuredData.OSDMap) // if (enumerator.Value is OpenMetaverse.StructuredData.LLSDMap)
if (enumerator.Value is Hashtable) if (enumerator.Value is Hashtable)
{ {
object fieldValue = field.GetValue(obj); object fieldValue = field.GetValue(obj);
DeserialiseOSDMap((Hashtable) enumerator.Value, fieldValue); DeserialiseLLSDMap((Hashtable) enumerator.Value, fieldValue);
// DeserialiseOSDMap((OpenMetaverse.StructuredData.OSDMap) enumerator.Value, fieldValue); // DeserialiseLLSDMap((OpenMetaverse.StructuredData.LLSDMap) enumerator.Value, fieldValue);
} }
else if (enumerator.Value is ArrayList) else if (enumerator.Value is ArrayList)
{ {

16
OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs
View File

@ -29,7 +29,7 @@ using OpenMetaverse;
namespace OpenSim.Framework.Communications.Capabilities namespace OpenSim.Framework.Communications.Capabilities
{ {
[OSDMap] [LLSDMap]
public class LLSDInventoryItem public class LLSDInventoryItem
{ {
public UUID parent_id; public UUID parent_id;
@ -47,7 +47,7 @@ namespace OpenSim.Framework.Communications.Capabilities
public int created_at; public int created_at;
} }
[OSDMap] [LLSDMap]
public class LLSDPermissions public class LLSDPermissions
{ {
public UUID creator_id; public UUID creator_id;
@ -61,20 +61,20 @@ namespace OpenSim.Framework.Communications.Capabilities
public bool is_owner_group; public bool is_owner_group;
} }
[OSDMap] [LLSDMap]
public class LLSDSaleInfo public class LLSDSaleInfo
{ {
public int sale_price; public int sale_price;
public string sale_type; public string sale_type;
} }
[OSDMap] [LLSDMap]
public class LLSDInventoryDescendents public class LLSDInventoryDescendents
{ {
public OSDArray folders = new OSDArray(); public LLSDArray folders = new LLSDArray();
} }
[OSDMap] [LLSDMap]
public class LLSDFetchInventoryDescendents public class LLSDFetchInventoryDescendents
{ {
public UUID folder_id; public UUID folder_id;
@ -84,13 +84,13 @@ namespace OpenSim.Framework.Communications.Capabilities
public bool fetch_items; public bool fetch_items;
} }
[OSDMap] [LLSDMap]
public class LLSDInventoryFolderContents public class LLSDInventoryFolderContents
{ {
public UUID agent___id; // the (three "_") "___" so the serialising knows to change this to a "-" public UUID agent___id; // the (three "_") "___" so the serialising knows to change this to a "-"
public int descendents; 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 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 UUID owner___id; // and of course we can't have field names with "-" in
public int version; public int version;
} }

2
OpenSim/Framework/Communications/Capabilities/LLSDItemUpdate.cs
View File

@ -29,7 +29,7 @@ using OpenMetaverse;
namespace OpenSim.Framework.Communications.Capabilities namespace OpenSim.Framework.Communications.Capabilities
{ {
[OSDMap] [LLSDMap]
public class LLSDItemUpdate public class LLSDItemUpdate
{ {
public UUID item_id; public UUID item_id;

4
OpenSim/Framework/Communications/Capabilities/LLSDMapLayer.cs
View File

@ -30,7 +30,7 @@ using OpenMetaverse;
namespace OpenSim.Framework.Communications.Capabilities namespace OpenSim.Framework.Communications.Capabilities
{ {
[LLSDType("MAP")] [LLSDType("MAP")]
public class OSDMapLayer public class LLSDMapLayer
{ {
public int Left = 0; public int Left = 0;
public int Right = 0; public int Right = 0;
@ -38,7 +38,7 @@ namespace OpenSim.Framework.Communications.Capabilities
public int Bottom = 0; public int Bottom = 0;
public UUID ImageID = UUID.Zero; public UUID ImageID = UUID.Zero;
public OSDMapLayer() public LLSDMapLayer()
{ {
} }
} }

2
OpenSim/Framework/Communications/Capabilities/LLSDMapLayerResponse.cs
View File

@ -31,7 +31,7 @@ namespace OpenSim.Framework.Communications.Capabilities
public class LLSDMapLayerResponse public class LLSDMapLayerResponse
{ {
public LLSDMapRequest AgentData = new LLSDMapRequest(); public LLSDMapRequest AgentData = new LLSDMapRequest();
public OSDArray LayerData = new OSDArray(); public LLSDArray LayerData = new LLSDArray();
public LLSDMapLayerResponse() public LLSDMapLayerResponse()
{ {

2
OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs
View File

@ -30,7 +30,7 @@ using System.Collections;
namespace OpenSim.Framework.Communications.Capabilities namespace OpenSim.Framework.Communications.Capabilities
{ {
[OSDMap] [LLSDMap]
public class LLSDParcelVoiceInfoResponse public class LLSDParcelVoiceInfoResponse
{ {
public int parcel_local_id; public int parcel_local_id;

4
OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
View File

@ -53,12 +53,12 @@ namespace OpenSim.Framework.Communications.Capabilities
//string requestBody = streamReader.ReadToEnd(); //string requestBody = streamReader.ReadToEnd();
//streamReader.Close(); //streamReader.Close();
// OpenMetaverse.StructuredData.OSDMap hash = (OpenMetaverse.StructuredData.OSDMap) // OpenMetaverse.StructuredData.LLSDMap hash = (OpenMetaverse.StructuredData.LLSDMap)
// OpenMetaverse.StructuredData.LLSDParser.DeserializeXml(new XmlTextReader(request)); // OpenMetaverse.StructuredData.LLSDParser.DeserializeXml(new XmlTextReader(request));
Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(request); Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(request);
TRequest llsdRequest = new TRequest(); TRequest llsdRequest = new TRequest();
LLSDHelpers.DeserialiseOSDMap(hash, llsdRequest); LLSDHelpers.DeserialiseLLSDMap(hash, llsdRequest);
TResponse response = m_method(llsdRequest); TResponse response = m_method(llsdRequest);

2
OpenSim/Framework/Communications/Capabilities/LLSDTaskInventoryUploadComplete.cs
View File

@ -29,7 +29,7 @@ using OpenMetaverse;
namespace OpenSim.Framework.Communications.Capabilities namespace OpenSim.Framework.Communications.Capabilities
{ {
[OSDMap] [LLSDMap]
public class LLSDTaskInventoryUploadComplete public class LLSDTaskInventoryUploadComplete
{ {
/// <summary> /// <summary>

2
OpenSim/Framework/Communications/Capabilities/LLSDTaskScriptUpdate.cs
View File

@ -29,7 +29,7 @@ using OpenMetaverse;
namespace OpenSim.Framework.Communications.Capabilities namespace OpenSim.Framework.Communications.Capabilities
{ {
[OSDMap] [LLSDMap]
public class LLSDTaskScriptUpdate public class LLSDTaskScriptUpdate
{ {
/// <summary> /// <summary>

4
OpenSim/Framework/Communications/Capabilities/LLSDType.cs
View File

@ -46,9 +46,9 @@ namespace OpenSim.Framework.Communications.Capabilities
} }
[AttributeUsage(AttributeTargets.Class)] [AttributeUsage(AttributeTargets.Class)]
public class OSDMap : LLSDType public class LLSDMap : LLSDType
{ {
public OSDMap() : base("MAP") public LLSDMap() : base("MAP")
{ {
} }
} }

2
OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs
View File

@ -28,7 +28,7 @@
namespace OpenSim.Framework.Communications.Capabilities namespace OpenSim.Framework.Communications.Capabilities
{ {
[OSDMap] [LLSDMap]
public class LLSDVoiceAccountResponse public class LLSDVoiceAccountResponse
{ {
public string username; public string username;

126
OpenSim/Framework/Communications/LoginResponse.cs
View File

@ -201,17 +201,17 @@ namespace OpenSim.Framework.Communications
return (xmlRpcResponse); 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; // Ensure Login Failed message/reason;
ErrorMessage = message; ErrorMessage = message;
ErrorReason = reason; ErrorReason = reason;
map["reason"] = OSD.FromString(ErrorReason); map["reason"] = LLSD.FromString(ErrorReason);
map["message"] = OSD.FromString(ErrorMessage); map["message"] = LLSD.FromString(ErrorMessage);
map["login"] = OSD.FromString(login); map["login"] = LLSD.FromString(login);
return map; return map;
} }
@ -221,7 +221,7 @@ namespace OpenSim.Framework.Communications
return (CreateLoginFailedResponse()); return (CreateLoginFailedResponse());
} }
public OSD CreateFailedResponseLLSD() public LLSD CreateFailedResponseLLSD()
{ {
return CreateLoginFailedResponseLLSD(); return CreateLoginFailedResponseLLSD();
} }
@ -234,7 +234,7 @@ namespace OpenSim.Framework.Communications
"false")); "false"));
} }
public OSD CreateLoginFailedResponseLLSD() public LLSD CreateLoginFailedResponseLLSD()
{ {
return GenerateFailureResponseLLSD( return GenerateFailureResponseLLSD(
"key", "key",
@ -265,7 +265,7 @@ namespace OpenSim.Framework.Communications
"false")); "false"));
} }
public OSD CreateAlreadyLoggedInResponseLLSD() public LLSD CreateAlreadyLoggedInResponseLLSD()
{ {
return GenerateFailureResponseLLSD( return GenerateFailureResponseLLSD(
"presence", "presence",
@ -283,7 +283,7 @@ namespace OpenSim.Framework.Communications
"false")); "false"));
} }
public OSD CreateLoginBlockedResponseLLSD() public LLSD CreateLoginBlockedResponseLLSD()
{ {
return GenerateFailureResponseLLSD( return GenerateFailureResponseLLSD(
"presence", "presence",
@ -299,7 +299,7 @@ namespace OpenSim.Framework.Communications
"false")); "false"));
} }
public OSD CreateDeadRegionResponseLLSD() public LLSD CreateDeadRegionResponseLLSD()
{ {
return GenerateFailureResponseLLSD( return GenerateFailureResponseLLSD(
"key", "key",
@ -315,7 +315,7 @@ namespace OpenSim.Framework.Communications
"false")); "false"));
} }
public OSD CreateGridErrorResponseLLSD() public LLSD CreateGridErrorResponseLLSD()
{ {
return GenerateFailureResponseLLSD( return GenerateFailureResponseLLSD(
"key", "key",
@ -404,90 +404,90 @@ namespace OpenSim.Framework.Communications
} }
} }
public OSD ToLLSDResponse() public LLSD ToLLSDResponse()
{ {
try try
{ {
OSDMap map = new OSDMap(); LLSDMap map = new LLSDMap();
map["first_name"] = OSD.FromString(Firstname); map["first_name"] = LLSD.FromString(Firstname);
map["last_name"] = OSD.FromString(Lastname); map["last_name"] = LLSD.FromString(Lastname);
map["agent_access"] = OSD.FromString(agentAccess); map["agent_access"] = LLSD.FromString(agentAccess);
map["sim_port"] = OSD.FromInteger(SimPort); map["sim_port"] = LLSD.FromInteger(SimPort);
map["sim_ip"] = OSD.FromString(SimAddress); map["sim_ip"] = LLSD.FromString(SimAddress);
map["agent_id"] = OSD.FromUUID(AgentID); map["agent_id"] = LLSD.FromUUID(AgentID);
map["session_id"] = OSD.FromUUID(SessionID); map["session_id"] = LLSD.FromUUID(SessionID);
map["secure_session_id"] = OSD.FromUUID(SecureSessionID); map["secure_session_id"] = LLSD.FromUUID(SecureSessionID);
map["circuit_code"] = OSD.FromInteger(CircuitCode); map["circuit_code"] = LLSD.FromInteger(CircuitCode);
map["seconds_since_epoch"] = OSD.FromInteger((int)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds); map["seconds_since_epoch"] = LLSD.FromInteger((int)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds);
#region Login Flags #region Login Flags
OSDMap loginFlagsLLSD = new OSDMap(); LLSDMap loginFlagsLLSD = new LLSDMap();
loginFlagsLLSD["daylight_savings"] = OSD.FromString(DST); loginFlagsLLSD["daylight_savings"] = LLSD.FromString(DST);
loginFlagsLLSD["stipend_since_login"] = OSD.FromString(StipendSinceLogin); loginFlagsLLSD["stipend_since_login"] = LLSD.FromString(StipendSinceLogin);
loginFlagsLLSD["gendered"] = OSD.FromString(Gendered); loginFlagsLLSD["gendered"] = LLSD.FromString(Gendered);
loginFlagsLLSD["ever_logged_in"] = OSD.FromString(EverLoggedIn); loginFlagsLLSD["ever_logged_in"] = LLSD.FromString(EverLoggedIn);
map["login-flags"] = WrapOSDMap(loginFlagsLLSD); map["login-flags"] = WrapLLSDMap(loginFlagsLLSD);
#endregion Login Flags #endregion Login Flags
#region Global Textures #region Global Textures
OSDMap globalTexturesLLSD = new OSDMap(); LLSDMap globalTexturesLLSD = new LLSDMap();
globalTexturesLLSD["sun_texture_id"] = OSD.FromString(SunTexture); globalTexturesLLSD["sun_texture_id"] = LLSD.FromString(SunTexture);
globalTexturesLLSD["cloud_texture_id"] = OSD.FromString(CloudTexture); globalTexturesLLSD["cloud_texture_id"] = LLSD.FromString(CloudTexture);
globalTexturesLLSD["moon_texture_id"] = OSD.FromString(MoonTexture); globalTexturesLLSD["moon_texture_id"] = LLSD.FromString(MoonTexture);
map["global-textures"] = WrapOSDMap(globalTexturesLLSD); map["global-textures"] = WrapLLSDMap(globalTexturesLLSD);
#endregion Global Textures #endregion Global Textures
map["seed_capability"] = OSD.FromString(seedCapability); map["seed_capability"] = LLSD.FromString(seedCapability);
map["event_categories"] = ArrayListToOSDArray(eventCategories); map["event_categories"] = ArrayListToLLSDArray(eventCategories);
//map["event_notifications"] = new OSDArray(); // todo //map["event_notifications"] = new LLSDArray(); // todo
map["classified_categories"] = ArrayListToOSDArray(classifiedCategories); map["classified_categories"] = ArrayListToLLSDArray(classifiedCategories);
#region UI Config #region UI Config
OSDMap uiConfigLLSD = new OSDMap(); LLSDMap uiConfigLLSD = new LLSDMap();
uiConfigLLSD["allow_first_life"] = OSD.FromString(allowFirstLife); uiConfigLLSD["allow_first_life"] = LLSD.FromString(allowFirstLife);
map["ui-config"] = WrapOSDMap(uiConfigLLSD); map["ui-config"] = WrapLLSDMap(uiConfigLLSD);
#endregion UI Config #endregion UI Config
#region Inventory #region Inventory
map["inventory-skeleton"] = ArrayListToOSDArray(agentInventory); map["inventory-skeleton"] = ArrayListToLLSDArray(agentInventory);
map["inventory-skel-lib"] = ArrayListToOSDArray(inventoryLibrary); map["inventory-skel-lib"] = ArrayListToLLSDArray(inventoryLibrary);
map["inventory-root"] = ArrayListToOSDArray(inventoryRoot); ; map["inventory-root"] = ArrayListToLLSDArray(inventoryRoot); ;
map["inventory-lib-root"] = ArrayListToOSDArray(inventoryLibRoot); map["inventory-lib-root"] = ArrayListToLLSDArray(inventoryLibRoot);
map["inventory-lib-owner"] = ArrayListToOSDArray(inventoryLibraryOwner); map["inventory-lib-owner"] = ArrayListToLLSDArray(inventoryLibraryOwner);
#endregion Inventory #endregion Inventory
map["gestures"] = ArrayListToOSDArray(activeGestures); map["gestures"] = ArrayListToLLSDArray(activeGestures);
map["initial-outfit"] = ArrayListToOSDArray(initialOutfit); map["initial-outfit"] = ArrayListToLLSDArray(initialOutfit);
map["start_location"] = OSD.FromString(startLocation); map["start_location"] = LLSD.FromString(startLocation);
map["seed_capability"] = OSD.FromString(seedCapability); map["seed_capability"] = LLSD.FromString(seedCapability);
map["home"] = OSD.FromString(home); map["home"] = LLSD.FromString(home);
map["look_at"] = OSD.FromString(lookAt); map["look_at"] = LLSD.FromString(lookAt);
map["message"] = OSD.FromString(welcomeMessage); map["message"] = LLSD.FromString(welcomeMessage);
map["region_x"] = OSD.FromInteger(RegionX * Constants.RegionSize); map["region_x"] = LLSD.FromInteger(RegionX * Constants.RegionSize);
map["region_y"] = OSD.FromInteger(RegionY * Constants.RegionSize); map["region_y"] = LLSD.FromInteger(RegionY * Constants.RegionSize);
if (m_buddyList != null) 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; 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) foreach (Hashtable ht in arrlst)
{ {
OSDMap mp = new OSDMap(); LLSDMap mp = new LLSDMap();
foreach (DictionaryEntry deHt in ht) 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); llsdBack.Add(mp);
} }
return llsdBack; 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); array.Add(wrapMe);
return array; return array;
} }

8
OpenSim/Framework/Communications/LoginService.cs
View File

@ -321,7 +321,7 @@ namespace OpenSim.Framework.Communications
/// </summary> /// </summary>
/// <param name="request">The LLSD request</param> /// <param name="request">The LLSD request</param>
/// <returns>The response to send</returns> /// <returns>The response to send</returns>
public OSD LLSDLoginMethod(OSD request) public LLSD LLSDLoginMethod(LLSD request)
{ {
// Temporary fix // Temporary fix
m_loginMutex.WaitOne(); m_loginMutex.WaitOne();
@ -335,9 +335,9 @@ namespace OpenSim.Framework.Communications
UserProfileData userProfile = null; UserProfileData userProfile = null;
LoginResponse logResponse = new LoginResponse(); 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")) if (map.ContainsKey("first") && map.ContainsKey("last") && map.ContainsKey("passwd"))
{ {
@ -749,7 +749,7 @@ namespace OpenSim.Framework.Communications
m_userManager.CreateAgent(profile, request); m_userManager.CreateAgent(profile, request);
} }
public void CreateAgent(UserProfileData profile, OSD request) public void CreateAgent(UserProfileData profile, LLSD request)
{ {
m_userManager.CreateAgent(profile, request); m_userManager.CreateAgent(profile, request);
} }

2
OpenSim/Framework/Communications/UserManagerBase.cs
View File

@ -448,7 +448,7 @@ namespace OpenSim.Framework.Communications
profile.CurrentAgent = agent; profile.CurrentAgent = agent;
} }
public void CreateAgent(UserProfileData profile, OSD request) public void CreateAgent(UserProfileData profile, LLSD request)
{ {
UserAgentData agent = new UserAgentData(); UserAgentData agent = new UserAgentData();

2
OpenSim/Framework/Location.cs
View File

@ -50,7 +50,7 @@ namespace OpenSim.Framework
public ulong RegionHandle 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 public int X

14
OpenSim/Framework/PrimitiveBaseShape.cs
View File

@ -874,7 +874,7 @@ namespace OpenSim.Framework
for (int k = 0; k < extraParamCount; k++) for (int k = 0; k < extraParamCount; k++)
{ {
ushort epType = Utils.BytesToUInt16(data, i); ushort epType = Helpers.BytesToUInt16(data, i);
i += 2; i += 2;
// uint paramLength = Helpers.BytesToUIntBig(data, i); // uint paramLength = Helpers.BytesToUIntBig(data, i);
@ -1014,9 +1014,9 @@ namespace OpenSim.Framework
_lightColorG = lColor.G; _lightColorG = lColor.G;
_lightColorB = lColor.B; _lightColorB = lColor.B;
_lightRadius = Utils.BytesToFloat(data, pos + 4); _lightRadius = Helpers.BytesToFloat(data, pos + 4);
_lightCutoff = Utils.BytesToFloat(data, pos + 8); _lightCutoff = Helpers.BytesToFloat(data, pos + 8);
_lightFalloff = Utils.BytesToFloat(data, pos + 12); _lightFalloff = Helpers.BytesToFloat(data, pos + 12);
} }
else else
{ {
@ -1040,9 +1040,9 @@ namespace OpenSim.Framework
Color4 tmpColor = new Color4(_lightColorR,_lightColorG,_lightColorB,_lightIntensity); Color4 tmpColor = new Color4(_lightColorR,_lightColorG,_lightColorB,_lightIntensity);
tmpColor.GetBytes().CopyTo(data, 0); tmpColor.GetBytes().CopyTo(data, 0);
Utils.FloatToBytes(_lightRadius).CopyTo(data, 4); Helpers.FloatToBytes(_lightRadius).CopyTo(data, 4);
Utils.FloatToBytes(_lightCutoff).CopyTo(data, 8); Helpers.FloatToBytes(_lightCutoff).CopyTo(data, 8);
Utils.FloatToBytes(_lightFalloff).CopyTo(data, 12); Helpers.FloatToBytes(_lightFalloff).CopyTo(data, 12);
return data; return data;
} }

18
OpenSim/Framework/Servers/BaseHttpServer.cs
View File

@ -692,8 +692,8 @@ namespace OpenSim.Framework.Servers
//m_log.DebugFormat("[OGP]: {0}:{1}", request.RawUrl, requestBody); //m_log.DebugFormat("[OGP]: {0}:{1}", request.RawUrl, requestBody);
response.KeepAlive = true; response.KeepAlive = true;
OSD llsdRequest = null; LLSD llsdRequest = null;
OSD llsdResponse = null; LLSD llsdResponse = null;
bool LegacyLLSDLoginLibOMV = (requestBody.Contains("passwd") && requestBody.Contains("mac") && requestBody.Contains("viewer_digest")); bool LegacyLLSDLoginLibOMV = (requestBody.Contains("passwd") && requestBody.Contains("mac") && requestBody.Contains("viewer_digest"));
@ -704,7 +704,7 @@ namespace OpenSim.Framework.Servers
} }
try try
{ {
llsdRequest = OSDParser.DeserializeLLSDXml(requestBody); llsdRequest = LLSDParser.DeserializeXml(requestBody);
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -756,7 +756,7 @@ namespace OpenSim.Framework.Servers
{ {
response.ContentType = "application/llsd+xml"; response.ContentType = "application/llsd+xml";
//m_log.Info("[Debug BASE HTTP SERVER]: Response: " + llsdResponse.ToString()); //m_log.Info("[Debug BASE HTTP SERVER]: Response: " + llsdResponse.ToString());
buffer = OSDParser.SerializeLLSDXmlBytes(llsdResponse); buffer = LLSDParser.SerializeXmlBytes(llsdResponse);
} }
response.SendChunked = false; response.SendChunked = false;
response.ContentLength64 = buffer.Length; response.ContentLength64 = buffer.Length;
@ -948,12 +948,12 @@ namespace OpenSim.Framework.Servers
} }
} }
private OSDMap GenerateNoLLSDHandlerResponse() private LLSDMap GenerateNoLLSDHandlerResponse()
{ {
OSDMap map = new OSDMap(); LLSDMap map = new LLSDMap();
map["reason"] = OSD.FromString("LLSDRequest"); map["reason"] = LLSD.FromString("LLSDRequest");
map["message"] = OSD.FromString("No handler registered for LLSD Requests"); map["message"] = LLSD.FromString("No handler registered for LLSD Requests");
map["login"] = OSD.FromString("false"); map["login"] = LLSD.FromString("false");
return map; return map;
} }
/// <summary> /// <summary>

5
OpenSim/Framework/Servers/BaseOpenSimServer.cs
View File

@ -341,7 +341,8 @@ namespace OpenSim.Framework.Servers
public virtual void Show(string[] showParams) public virtual void Show(string[] showParams)
{ {
switch (showParams[0]) switch (showParams[0])
{ {
case "info": case "info":
Notice("Version: " + m_version); Notice("Version: " + m_version);
Notice("Startup directory: " + m_startupDirectory); Notice("Startup directory: " + m_startupDirectory);
@ -349,7 +350,9 @@ namespace OpenSim.Framework.Servers
case "stats": case "stats":
if (m_stats != null) if (m_stats != null)
{
Notice(m_stats.Report()); Notice(m_stats.Report());
}
break; break;
case "threads": case "threads":

4
OpenSim/Framework/Servers/LLSDMethod.cs
View File

@ -29,6 +29,6 @@ using OpenMetaverse.StructuredData;
namespace OpenSim.Framework.Servers namespace OpenSim.Framework.Servers
{ {
public delegate OSD LLSDMethod( string path, OSD request, string endpoint ); public delegate LLSD LLSDMethod( string path, LLSD request, string endpoint );
public delegate OSD DefaultLLSDMethod(OSD request); public delegate LLSD DefaultLLSDMethod(LLSD request);
} }

2
OpenSim/Framework/Servers/LLSDMethodString.cs
View File

@ -29,5 +29,5 @@ using OpenMetaverse.StructuredData;
namespace OpenSim.Framework.Servers namespace OpenSim.Framework.Servers
{ {
public delegate OSD LLSDMethodString(OSD request, string thePath); public delegate LLSD LLSDMethodString(LLSD request, string thePath);
} }

2
OpenSim/Framework/UserProfileData.cs
View File

@ -156,7 +156,7 @@ namespace OpenSim.Framework
/// </summary> /// </summary>
public virtual ulong HomeRegion 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 set
{ {
_homeRegionX = (uint) (value >> 40); _homeRegionX = (uint) (value >> 40);

10
OpenSim/Framework/Util.cs
View File

@ -185,7 +185,7 @@ namespace OpenSim.Framework
public static ulong UIntsToLong(uint X, uint Y) 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) 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) public static void ParseFakeParcelID(UUID parcelID, out ulong regionHandle, out uint x, out uint y)
{ {
byte[] bytes = parcelID.GetBytes(); byte[] bytes = parcelID.GetBytes();
regionHandle = Utils.BytesToUInt64(bytes); regionHandle = Helpers.BytesToUInt64(bytes);
x = Utils.BytesToUInt(bytes, 8); x = Helpers.BytesToUInt(bytes, 8);
y = Utils.BytesToUInt(bytes, 12); y = Helpers.BytesToUInt(bytes, 12);
} }
public static void FakeParcelIDToGlobalPosition(UUID parcelID, out uint x, out uint y) public static void FakeParcelIDToGlobalPosition(UUID parcelID, out uint x, out uint y)
@ -794,7 +794,7 @@ namespace OpenSim.Framework
uint rx, ry; uint rx, ry;
ParseFakeParcelID(parcelID, out regionHandle, out x, out y); ParseFakeParcelID(parcelID, out regionHandle, out x, out y);
Utils.LongToUInts(regionHandle, out rx, out ry); Helpers.LongToUInts(regionHandle, out rx, out ry);
x += rx; x += rx;
y += ry; y += ry;

12
OpenSim/Grid/GridServer/GridManager.cs
View File

@ -582,12 +582,12 @@ namespace OpenSim.Grid.GridServer
{ {
if ( if (
GetRegion( GetRegion(
Utils.UIntsToLong((uint)((sim.regionLocX + x) * Constants.RegionSize), Helpers.UIntsToLong((uint)((sim.regionLocX + x) * Constants.RegionSize),
(uint)(sim.regionLocY + y) * Constants.RegionSize)) != null) (uint)(sim.regionLocY + y) * Constants.RegionSize)) != null)
{ {
neighbour = neighbour =
GetRegion( GetRegion(
Utils.UIntsToLong((uint)((sim.regionLocX + x) * Constants.RegionSize), Helpers.UIntsToLong((uint)((sim.regionLocX + x) * Constants.RegionSize),
(uint)(sim.regionLocY + y) * Constants.RegionSize)); (uint)(sim.regionLocY + y) * Constants.RegionSize));
NeighbourBlock = new Hashtable(); NeighbourBlock = new Hashtable();
@ -675,7 +675,7 @@ namespace OpenSim.Grid.GridServer
} }
catch (KeyNotFoundException) { } catch (KeyNotFoundException) { }
sim.regionHandle = Utils.UIntsToLong((sim.regionLocX * Constants.RegionSize), (sim.regionLocY * Constants.RegionSize)); sim.regionHandle = Helpers.UIntsToLong((sim.regionLocX * Constants.RegionSize), (sim.regionLocY * Constants.RegionSize));
sim.serverURI = (string)requestData["server_uri"]; sim.serverURI = (string)requestData["server_uri"];
sim.httpServerURI = "http://" + sim.serverIP + ":" + sim.httpPort + "/"; sim.httpServerURI = "http://" + sim.serverIP + ":" + sim.httpPort + "/";
@ -894,7 +894,7 @@ namespace OpenSim.Grid.GridServer
{ {
for (int y = ymin; y < ymax + 1; y++) for (int y = ymin; y < ymax + 1; y++)
{ {
ulong regHandle = Utils.UIntsToLong((uint)(x * Constants.RegionSize), (uint)(y * Constants.RegionSize)); ulong regHandle = Helpers.UIntsToLong((uint)(x * Constants.RegionSize), (uint)(y * Constants.RegionSize));
simProfile = GetRegion(regHandle); simProfile = GetRegion(regHandle);
if (simProfile != null) if (simProfile != null)
{ {
@ -1124,12 +1124,12 @@ namespace OpenSim.Grid.GridServer
case "region_locx": case "region_locx":
theSim.regionLocX = Convert.ToUInt32((string)simnode.ChildNodes[i].InnerText); theSim.regionLocX = Convert.ToUInt32((string)simnode.ChildNodes[i].InnerText);
theSim.regionHandle = Utils.UIntsToLong((theSim.regionLocX * Constants.RegionSize), (theSim.regionLocY * Constants.RegionSize)); theSim.regionHandle = Helpers.UIntsToLong((theSim.regionLocX * Constants.RegionSize), (theSim.regionLocY * Constants.RegionSize));
break; break;
case "region_locy": case "region_locy":
theSim.regionLocY = Convert.ToUInt32((string)simnode.ChildNodes[i].InnerText); theSim.regionLocY = Convert.ToUInt32((string)simnode.ChildNodes[i].InnerText);
theSim.regionHandle = Utils.UIntsToLong((theSim.regionLocX * Constants.RegionSize), (theSim.regionLocY * Constants.RegionSize)); theSim.regionHandle = Helpers.UIntsToLong((theSim.regionLocX * Constants.RegionSize), (theSim.regionLocY * Constants.RegionSize));
break; break;
} }
} }

2
OpenSim/Grid/MessagingServer/MessageService.cs
View File

@ -484,7 +484,7 @@ namespace OpenSim.Grid.MessagingServer
regionProfile = new RegionProfileData(); regionProfile = new RegionProfileData();
regionProfile.httpPort = (uint)Convert.ToInt32((string)responseData["http_port"]); regionProfile.httpPort = (uint)Convert.ToInt32((string)responseData["http_port"]);
regionProfile.httpServerURI = "http://" + internalIpStr + ":" + regionProfile.httpPort + "/"; regionProfile.httpServerURI = "http://" + internalIpStr + ":" + regionProfile.httpPort + "/";
regionProfile.regionHandle = Utils.UIntsToLong((regX * Constants.RegionSize), (regY * Constants.RegionSize)); regionProfile.regionHandle = Helpers.UIntsToLong((regX * Constants.RegionSize), (regY * Constants.RegionSize));
regionProfile.regionLocX = regX; regionProfile.regionLocX = regX;
regionProfile.regionLocY = regY; regionProfile.regionLocY = regY;

4
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -3890,7 +3890,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{ {
uint regionX; uint regionX;
uint regionY; uint regionY;
Utils.LongToUInts(Scene.RegionInfo.RegionHandle, out regionX, out regionY); Helpers.LongToUInts(Scene.RegionInfo.RegionHandle, out regionX, out regionY);
locx = Convert.ToSingle(Utils.BytesToString(gmParams[0].Parameter)) - regionX; locx = Convert.ToSingle(Utils.BytesToString(gmParams[0].Parameter)) - regionX;
locy = Convert.ToSingle(Utils.BytesToString(gmParams[1].Parameter)) - regionY; locy = Convert.ToSingle(Utils.BytesToString(gmParams[1].Parameter)) - regionY;
locz = Convert.ToSingle(Utils.BytesToString(gmParams[2].Parameter)); locz = Convert.ToSingle(Utils.BytesToString(gmParams[2].Parameter));
@ -7175,7 +7175,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
Transfer.TransferInfo.Params = new byte[20]; Transfer.TransferInfo.Params = new byte[20];
Array.Copy(req.RequestAssetID.GetBytes(), 0, Transfer.TransferInfo.Params, 0, 16); Array.Copy(req.RequestAssetID.GetBytes(), 0, Transfer.TransferInfo.Params, 0, 16);
int assType = req.AssetInf.Type; int assType = req.AssetInf.Type;
Array.Copy(Utils.IntToBytes(assType), 0, Transfer.TransferInfo.Params, 16, 4); Array.Copy(Helpers.IntToBytes(assType), 0, Transfer.TransferInfo.Params, 16, 4);
} }
else if (req.AssetRequestSource == 3) else if (req.AssetRequestSource == 3)
{ {

2
OpenSim/Region/DataSnapshot/DataRequestHandler.cs
View File

@ -77,7 +77,7 @@ namespace OpenSim.Region.DataSnapshot
{ {
//Very static for now, flexible enough to add new formats //Very static for now, flexible enough to add new formats
LLSDDiscoveryResponse llsd_response = new LLSDDiscoveryResponse(); LLSDDiscoveryResponse llsd_response = new LLSDDiscoveryResponse();
llsd_response.snapshot_resources = new OSDArray(); llsd_response.snapshot_resources = new LLSDArray();
LLSDDiscoveryDataURL llsd_dataurl = new LLSDDiscoveryDataURL(); LLSDDiscoveryDataURL llsd_dataurl = new LLSDDiscoveryDataURL();
llsd_dataurl.snapshot_format = "os-datasnapshot-v1"; llsd_dataurl.snapshot_format = "os-datasnapshot-v1";

6
OpenSim/Region/DataSnapshot/LLSDDiscovery.cs
View File

@ -30,13 +30,13 @@ using OpenSim.Framework.Communications.Capabilities;
namespace OpenSim.Region.DataSnapshot namespace OpenSim.Region.DataSnapshot
{ {
[OSDMap] [LLSDMap]
public class LLSDDiscoveryResponse public class LLSDDiscoveryResponse
{ {
public OSDArray snapshot_resources; public LLSDArray snapshot_resources;
} }
[OSDMap] [LLSDMap]
public class LLSDDiscoveryDataURL public class LLSDDiscoveryDataURL
{ {
public string snapshot_format; public string snapshot_format;

62
OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs
View File

@ -176,52 +176,44 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
{ {
ITextureSender sender = null; ITextureSender sender = null;
// try try
// { {
while (true) while (true)
{ {
try sender = m_queueSenders.Dequeue();
{
sender = m_queueSenders.Dequeue();
if (sender.Cancel) if (sender.Cancel)
{
TextureSent(sender);
sender.Cancel = false;
}
else
{
bool finished = sender.SendTexturePacket();
if (finished)
{ {
TextureSent(sender); TextureSent(sender);
sender.Cancel = false;
} }
else else
{ {
bool finished = sender.SendTexturePacket(); m_queueSenders.Enqueue(sender);
if (finished)
{
TextureSent(sender);
}
else
{
m_queueSenders.Enqueue(sender);
}
} }
// Make sure that any sender we currently have can get garbage collected
sender = null;
//m_log.InfoFormat("[TEXTURE] Texture sender queue size: {0}", m_queueSenders.Count());
}
catch(Exception e)
{
m_log.ErrorFormat(
"[TEXTURE]: Texture send thread caught exception. The texture send was aborted. Exception is {0}", e);
} }
// Make sure that any sender we currently have can get garbage collected
sender = null;
//m_log.InfoFormat("[TEXTURE] Texture sender queue size: {0}", m_queueSenders.Count());
} }
// } }
// catch (Exception e) catch (Exception e)
// { {
// // TODO: Let users in the sim and those entering it and possibly an external watchdog know what has happened // TODO: Let users in the sim and those entering it and possibly an external watchdog know what has happened
// m_log.ErrorFormat( m_log.ErrorFormat(
// "[TEXTURE]: Texture send thread terminating with exception. PLEASE REBOOT YOUR SIM - TEXTURES WILL NOT BE AVAILABLE UNTIL YOU DO. Exception is {0}", "[TEXTURE]: Texture send thread terminating with exception. PLEASE REBOOT YOUR SIM - TEXTURES WILL NOT BE AVAILABLE UNTIL YOU DO. Exception is {0}",
// e); e);
// } }
} }
/// <summary> /// <summary>

1
OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs
View File

@ -28,6 +28,7 @@
using System.Reflection; using System.Reflection;
using log4net; using log4net;
using OpenMetaverse; using OpenMetaverse;
using OpenMetaverse.Packets;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Interfaces;

9
OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs
View File

@ -57,10 +57,11 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
/// <summary> /// <summary>
/// We will allow the client to request the same texture n times before dropping further requests /// We will allow the client to request the same texture n times before dropping further requests
/// ///
/// This number contains repeated requests for the same texture at different resolutions (which /// This number includes repeated requests for the same texture at different resolutions (which we don't
/// are handled since r7368). However, this situation should be handled in a more sophisticated way. /// currently handle properly as far as I know). However, this situation should be handled in a more
/// sophisticated way.
/// </summary> /// </summary>
private static readonly int MAX_ALLOWED_TEXTURE_REQUESTS = 15; private static readonly int MAX_ALLOWED_TEXTURE_REQUESTS = 5;
/// <summary> /// <summary>
/// XXX Also going to limit requests for found textures. /// XXX Also going to limit requests for found textures.
@ -149,7 +150,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
m_scene.AddPendingDownloads(1); m_scene.AddPendingDownloads(1);
TextureSender.TextureSender requestHandler = new TextureSender.TextureSender(m_client, e.DiscardLevel, e.PacketNumber, e.Priority); TextureSender.TextureSender requestHandler = new TextureSender.TextureSender(m_client, e.DiscardLevel, e.PacketNumber);
m_textureSenders.Add(e.RequestedAssetID, requestHandler); m_textureSenders.Add(e.RequestedAssetID, requestHandler);
m_scene.AssetCache.GetAsset(e.RequestedAssetID, TextureCallback, true); m_scene.AssetCache.GetAsset(e.RequestedAssetID, TextureCallback, true);

311
OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs
View File

@ -27,104 +27,13 @@
using System; using System;
using System.Reflection; using System.Reflection;
using OpenMetaverse.Packets;
using log4net; using log4net;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Interfaces;
namespace OpenSim.Region.Environment.Modules.Agent.TextureSender namespace OpenSim.Region.Environment.Modules.Agent.TextureSender
{ {
public class ImageDownload
{
public const int FIRST_IMAGE_PACKET_SIZE = 600;
public const int IMAGE_PACKET_SIZE = 1000;
public OpenMetaverse.AssetTexture Texture;
public int DiscardLevel;
public float Priority;
public int CurrentPacket;
public int StopPacket;
public ImageDownload(OpenMetaverse.AssetTexture texture, int discardLevel, float priority, int packet)
{
Texture = texture;
Update(discardLevel, priority, packet);
}
/// <summary>
/// Updates an image transfer with new information and recalculates
/// offsets
/// </summary>
/// <param name="discardLevel">New requested discard level</param>
/// <param name="priority">New requested priority</param>
/// <param name="packet">New requested packet offset</param>
public void Update(int discardLevel, float priority, int packet)
{
Priority = priority;
DiscardLevel = Clamp(discardLevel, 0, Texture.LayerInfo.Length - 1);
StopPacket = GetPacketForBytePosition(Texture.LayerInfo[(Texture.LayerInfo.Length - 1) - DiscardLevel].End);
CurrentPacket = Clamp(packet, 1, TexturePacketCount());
}
/// <summary>
/// Returns the total number of packets needed to transfer this texture,
/// including the first packet of size FIRST_IMAGE_PACKET_SIZE
/// </summary>
/// <returns>Total number of packets needed to transfer this texture</returns>
public int TexturePacketCount()
{
return ((Texture.AssetData.Length - FIRST_IMAGE_PACKET_SIZE + IMAGE_PACKET_SIZE - 1) / IMAGE_PACKET_SIZE) + 1;
}
/// <summary>
/// Returns the current byte offset for this transfer, calculated from
/// the CurrentPacket
/// </summary>
/// <returns>Current byte offset for this transfer</returns>
public int CurrentBytePosition()
{
return FIRST_IMAGE_PACKET_SIZE + (CurrentPacket - 1) * IMAGE_PACKET_SIZE;
}
/// <summary>
/// Returns the size, in bytes, of the last packet. This will be somewhere
/// between 1 and IMAGE_PACKET_SIZE bytes
/// </summary>
/// <returns>Size of the last packet in the transfer</returns>
public int LastPacketSize()
{
return Texture.AssetData.Length - (FIRST_IMAGE_PACKET_SIZE + ((TexturePacketCount() - 2) * IMAGE_PACKET_SIZE));
}
/// <summary>
/// Find the packet number that contains a given byte position
/// </summary>
/// <param name="bytePosition">Byte position</param>
/// <returns>Packet number that contains the given byte position</returns>
int GetPacketForBytePosition(int bytePosition)
{
return ((bytePosition - FIRST_IMAGE_PACKET_SIZE + IMAGE_PACKET_SIZE - 1) / IMAGE_PACKET_SIZE);
}
/// <summary>
/// Clamp a given value between a range
/// </summary>
/// <param name="value">Value to clamp</param>
/// <param name="min">Minimum allowable value</param>
/// <param name="max">Maximum allowable value</param>
/// <returns>A value inclusively between lower and upper</returns>
static int Clamp(int value, int min, int max)
{
// First we check to see if we're greater than the max
value = (value > max) ? max : value;
// Then we check to see if we're less than the min.
value = (value < min) ? min : value;
// There's no check to see if min > max.
return value;
}
}
/// <summary> /// <summary>
/// A TextureSender handles the process of receiving a texture requested by the client from the /// A TextureSender handles the process of receiving a texture requested by the client from the
/// AssetCache, and then sending that texture back to the client. /// AssetCache, and then sending that texture back to the client.
@ -134,81 +43,90 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender
private static readonly ILog m_log private static readonly ILog m_log
= LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
/// <summary>
/// Records the number of times texture send has been called.
/// </summary>
public int counter = 0;
public bool ImageLoaded = false; public bool ImageLoaded = false;
/// <summary> /// <summary>
/// Holds the texture asset to send. /// Holds the texture asset to send.
/// </summary> /// </summary>
private AssetBase m_asset; private AssetBase m_asset;
private bool m_cancel = false;
private bool m_sending = false;
private bool sendFirstPacket = false;
private int initialDiscardLevel = 0;
private int initialPacketNum = 0;
private float initialPriority = 0.0f;
private ImageDownload download; //public UUID assetID { get { return m_asset.FullID; } }
// private bool m_cancel = false;
// See ITextureSender
// private bool m_sending = false;
/// <summary>
/// This is actually the number of extra packets required to send the texture data! We always assume
/// at least one is required.
/// </summary>
private int NumPackets = 0;
/// <summary>
/// Holds the packet number to send next. In this case, each packet is 1000 bytes long and starts
/// at the 600th byte (0th indexed).
/// </summary>
private int PacketCounter = 0;
private int RequestedDiscardLevel = -1;
private IClientAPI RequestUser; private IClientAPI RequestUser;
private uint StartPacketNumber = 0;
public TextureSender(IClientAPI client, int discardLevel, uint packetNumber, float priority) public TextureSender(IClientAPI client, int discardLevel, uint packetNumber)
{ {
RequestUser = client; RequestUser = client;
initialDiscardLevel = discardLevel; RequestedDiscardLevel = discardLevel;
initialPacketNum = (int)packetNumber; StartPacketNumber = packetNumber;
initialPriority = priority;
} }
#region ITextureSender Members #region ITextureSender Members
public bool Cancel public bool Cancel
{ {
get { return m_cancel; } get { return false; }
set { m_cancel = value; } set
{
// m_cancel = value;
}
} }
public bool Sending public bool Sending
{ {
get { return m_sending; } get { return false; }
set { m_sending = value; } set
{
// m_sending = value;
}
} }
// See ITextureSender // See ITextureSender
public void UpdateRequest(int discardLevel, uint packetNumber) public void UpdateRequest(int discardLevel, uint packetNumber)
{ {
if (download == null) RequestedDiscardLevel = discardLevel;
return; StartPacketNumber = packetNumber;
PacketCounter = (int) StartPacketNumber;
lock (download)
{
if (discardLevel < download.DiscardLevel)
m_log.DebugFormat("Image download {0} is changing from DiscardLevel {1} to {2}",
m_asset.FullID, download.DiscardLevel, discardLevel);
if (packetNumber != download.CurrentPacket)
m_log.DebugFormat("Image download {0} is changing from Packet {1} to {2}",
m_asset.FullID, download.CurrentPacket, packetNumber);
download.Update(discardLevel, download.Priority, (int)packetNumber);
sendFirstPacket = true;
}
} }
// See ITextureSender // See ITextureSender
public bool SendTexturePacket() public bool SendTexturePacket()
{ {
if (download != null && !m_cancel && (sendFirstPacket || download.CurrentPacket <= download.StopPacket)) //m_log.DebugFormat("[TEXTURE SENDER]: Sending packet for {0}", m_asset.FullID);
SendPacket();
counter++;
if ((NumPackets == 0) || (RequestedDiscardLevel == -1) || (PacketCounter > NumPackets) ||
((RequestedDiscardLevel > 0) && (counter > 50 + (NumPackets / (RequestedDiscardLevel + 1)))))
{ {
SendPacket();
return false;
}
else
{
m_sending = false;
m_cancel = true;
sendFirstPacket = false;
return true; return true;
} }
return false;
} }
#endregion #endregion
@ -222,52 +140,9 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender
public void TextureReceived(AssetBase asset) public void TextureReceived(AssetBase asset)
{ {
m_asset = asset; m_asset = asset;
NumPackets = CalculateNumPackets(asset.Data.Length);
try PacketCounter = (int) StartPacketNumber;
{ ImageLoaded = true;
OpenMetaverse.AssetTexture texture = new OpenMetaverse.AssetTexture(m_asset.FullID, m_asset.Data);
if (texture.DecodeLayerBoundaries())
{
bool sane = true;
// Sanity check all of the layers
for (int i = 0; i < texture.LayerInfo.Length; i++)
{
if (texture.LayerInfo[i].End > texture.AssetData.Length)
{
sane = false;
break;
}
}
if (sane)
{
download = new ImageDownload(texture, initialDiscardLevel, initialPriority, initialPacketNum);
ImageLoaded = true;
m_sending = true;
m_cancel = false;
sendFirstPacket = true;
return;
}
else
{
m_log.Error("JPEG2000 texture decoding succeeded, but sanity check failed for " +
m_asset.FullID.ToString());
}
}
else
{
m_log.Error("JPEG2000 texture decoding failed for " + m_asset.FullID.ToString());
}
}
catch (Exception ex)
{
m_log.Error("JPEG2000 texture decoding threw an exception for " + m_asset.FullID.ToString(), ex);
}
ImageLoaded = false;
m_sending = false;
m_cancel = true;
} }
/// <summary> /// <summary>
@ -275,48 +150,66 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender
/// </summary> /// </summary>
private void SendPacket() private void SendPacket()
{ {
lock (download) if (PacketCounter <= NumPackets)
{ {
if (sendFirstPacket) if (PacketCounter == 0)
{ {
sendFirstPacket = false; if (NumPackets == 0)
if (m_asset.Data.Length <= ImageDownload.FIRST_IMAGE_PACKET_SIZE)
{ {
RequestUser.SendImageFirstPart(1, m_asset.FullID, (uint)m_asset.Data.Length, m_asset.Data, 2); RequestUser.SendImageFirstPart(1, m_asset.FullID, (uint)m_asset.Data.Length, m_asset.Data, 2);
return; PacketCounter++;
} }
else else
{ {
byte[] firstImageData = new byte[ImageDownload.FIRST_IMAGE_PACKET_SIZE]; byte[] ImageData1 = new byte[600];
try { Buffer.BlockCopy(m_asset.Data, 0, firstImageData, 0, ImageDownload.FIRST_IMAGE_PACKET_SIZE); } Array.Copy(m_asset.Data, 0, ImageData1, 0, 600);
catch (Exception)
{ RequestUser.SendImageFirstPart(
m_log.Error("Texture data copy failed on first packet for " + m_asset.FullID.ToString()); (ushort)(NumPackets), m_asset.FullID, (uint)m_asset.Data.Length, ImageData1, 2);
m_cancel = true; PacketCounter++;
m_sending = false;
return;
}
RequestUser.SendImageFirstPart((ushort)download.TexturePacketCount(), m_asset.FullID, (uint)m_asset.Data.Length, firstImageData, 2);
} }
} }
else
int imagePacketSize = (download.CurrentPacket == download.TexturePacketCount() - 1) ?
download.LastPacketSize() : ImageDownload.IMAGE_PACKET_SIZE;
byte[] imageData = new byte[imagePacketSize];
try { Buffer.BlockCopy(m_asset.Data, download.CurrentBytePosition(), imageData, 0, imagePacketSize); }
catch (Exception)
{ {
m_log.Error("Texture data copy failed for " + m_asset.FullID.ToString()); int size = m_asset.Data.Length - 600 - (1000 * (PacketCounter - 1));
m_cancel = true; if (size > 1000) size = 1000;
m_sending = false; byte[] imageData = new byte[size];
return; try
{
Array.Copy(m_asset.Data, 600 + (1000 * (PacketCounter - 1)), imageData, 0, size);
}
catch (ArgumentOutOfRangeException)
{
m_log.Error("[TEXTURE SENDER]: Unable to separate texture into multiple packets: Array bounds failure on asset:" +
m_asset.FullID.ToString());
return;
}
RequestUser.SendImageNextPart((ushort)PacketCounter, m_asset.FullID, imageData);
PacketCounter++;
} }
RequestUser.SendImageNextPart((ushort)download.CurrentPacket, m_asset.FullID, imageData);
++download.CurrentPacket;
} }
} }
/// <summary>
/// Calculate the number of packets that will be required to send the texture loaded into this sender
/// This is actually the number of 1000 byte packets not including an initial 600 byte packet...
/// </summary>
/// <param name="length"></param>
/// <returns></returns>
private int CalculateNumPackets(int length)
{
int numPackets = 0;
if (length > 600)
{
//over 600 bytes so split up file
int restData = (length - 600);
int restPackets = ((restData + 999) / 1000);
numPackets = restPackets;
}
return numPackets;
}
} }
} }

4
OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs
View File

@ -174,7 +174,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.Xfer
{ {
// for now (testing) we only support files under 1000 bytes // for now (testing) we only support files under 1000 bytes
byte[] transferData = new byte[Data.Length + 4]; byte[] transferData = new byte[Data.Length + 4];
Array.Copy(Utils.IntToBytes(Data.Length), 0, transferData, 0, 4); Array.Copy(Helpers.IntToBytes(Data.Length), 0, transferData, 0, 4);
Array.Copy(Data, 0, transferData, 4, Data.Length); Array.Copy(Data, 0, transferData, 4, Data.Length);
Client.SendXferPacket(XferID, 0 + 0x80000000, transferData); Client.SendXferPacket(XferID, 0 + 0x80000000, transferData);
@ -183,7 +183,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.Xfer
else else
{ {
byte[] transferData = new byte[1000 + 4]; byte[] transferData = new byte[1000 + 4];
Array.Copy(Utils.IntToBytes(Data.Length), 0, transferData, 0, 4); Array.Copy(Helpers.IntToBytes(Data.Length), 0, transferData, 0, 4);
Array.Copy(Data, 0, transferData, 4, 1000); Array.Copy(Data, 0, transferData, 4, 1000);
Client.SendXferPacket(XferID, 0, transferData); Client.SendXferPacket(XferID, 0, transferData);
Packet++; Packet++;

1
OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
View File

@ -29,6 +29,7 @@ using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Reflection; using System.Reflection;
using OpenMetaverse; using OpenMetaverse;
using OpenMetaverse.Packets;
using log4net; using log4net;
using Nini.Config; using Nini.Config;
using Nwc.XmlRpc; using Nwc.XmlRpc;

30
OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs
View File

@ -44,18 +44,18 @@ using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.Interfaces; using OpenSim.Region.Interfaces;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Environment.Scenes;
using OSD = OpenMetaverse.StructuredData.OSD; using LLSD = OpenMetaverse.StructuredData.LLSD;
using OSDMap = OpenMetaverse.StructuredData.OSDMap; using LLSDMap = OpenMetaverse.StructuredData.LLSDMap;
using OSDArray = OpenMetaverse.StructuredData.OSDArray; using LLSDArray = OpenMetaverse.StructuredData.LLSDArray;
using Caps = OpenSim.Framework.Communications.Capabilities.Caps; using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
using BlockingLLSDQueue = OpenSim.Framework.BlockingQueue<OpenMetaverse.StructuredData.OSD>; using BlockingLLSDQueue = OpenSim.Framework.BlockingQueue<OpenMetaverse.StructuredData.LLSD>;
namespace OpenSim.Region.Environment.Modules.Framework namespace OpenSim.Region.Environment.Modules.Framework
{ {
public struct QueueItem public struct QueueItem
{ {
public int id; public int id;
public OSDMap body; public LLSDMap body;
} }
public class EventQueueGetModule : IEventQueue, IRegionModule public class EventQueueGetModule : IEventQueue, IRegionModule
@ -146,7 +146,7 @@ namespace OpenSim.Region.Environment.Modules.Framework
#region IEventQueue Members #region IEventQueue Members
public bool Enqueue(OSD ev, UUID avatarID) public bool Enqueue(LLSD ev, UUID avatarID)
{ {
m_log.DebugFormat("[EVENTQUEUE]: Enqueuing event for {0} in region {1}", avatarID, m_scene.RegionInfo.RegionName); m_log.DebugFormat("[EVENTQUEUE]: Enqueuing event for {0} in region {1}", avatarID, m_scene.RegionInfo.RegionName);
try try
@ -308,7 +308,7 @@ namespace OpenSim.Region.Environment.Modules.Framework
// } // }
BlockingLLSDQueue queue = GetQueue(agentID); BlockingLLSDQueue queue = GetQueue(agentID);
OSD element = queue.Dequeue(15000); // 15s timeout LLSD element = queue.Dequeue(15000); // 15s timeout
Hashtable responsedata = new Hashtable(); Hashtable responsedata = new Hashtable();
@ -337,7 +337,7 @@ namespace OpenSim.Region.Environment.Modules.Framework
OSDArray array = new OSDArray(); LLSDArray array = new LLSDArray();
if (element == null) // didn't have an event in 15s if (element == null) // didn't have an event in 15s
{ {
// Send it a fake event to keep the client polling! It doesn't like 502s like the proxys say! // Send it a fake event to keep the client polling! It doesn't like 502s like the proxys say!
@ -354,10 +354,10 @@ namespace OpenSim.Region.Environment.Modules.Framework
} }
} }
OSDMap events = new OSDMap(); LLSDMap events = new LLSDMap();
events.Add("events", array); events.Add("events", array);
events.Add("id", new OSDInteger(thisID)); events.Add("id", new LLSDInteger(thisID));
lock (m_ids) lock (m_ids)
{ {
m_ids[agentID] = thisID + 1; m_ids[agentID] = thisID + 1;
@ -366,7 +366,7 @@ namespace OpenSim.Region.Environment.Modules.Framework
responsedata["int_response_code"] = 200; responsedata["int_response_code"] = 200;
responsedata["content_type"] = "application/xml"; responsedata["content_type"] = "application/xml";
responsedata["keepalive"] = false; responsedata["keepalive"] = false;
responsedata["str_response_string"] = OSDParser.SerializeLLSDXmlString(events); responsedata["str_response_string"] = LLSDParser.SerializeXmlString(events);
m_log.DebugFormat("[EVENTQUEUE]: sending response for {0} in region {1}: {2}", agentID, m_scene.RegionInfo.RegionName, responsedata["str_response_string"]); m_log.DebugFormat("[EVENTQUEUE]: sending response for {0} in region {1}: {2}", agentID, m_scene.RegionInfo.RegionName, responsedata["str_response_string"]);
return responsedata; return responsedata;
@ -424,7 +424,7 @@ namespace OpenSim.Region.Environment.Modules.Framework
} }
public OSD EventQueueFallBack(string path, OSD request, string endpoint) public LLSD EventQueueFallBack(string path, LLSD request, string endpoint)
{ {
// This is a fallback element to keep the client from loosing EventQueueGet // This is a fallback element to keep the client from loosing EventQueueGet
// Why does CAPS fail sometimes!? // Why does CAPS fail sometimes!?
@ -473,7 +473,7 @@ namespace OpenSim.Region.Environment.Modules.Framework
thisID = m_ids[AvatarID]; thisID = m_ids[AvatarID];
BlockingLLSDQueue queue = GetQueue(AvatarID); BlockingLLSDQueue queue = GetQueue(AvatarID);
OSDArray array = new OSDArray(); LLSDArray array = new LLSDArray();
LLSD element = queue.Dequeue(15000); // 15s timeout LLSD element = queue.Dequeue(15000); // 15s timeout
if (element == null) if (element == null)
{ {
@ -489,7 +489,7 @@ namespace OpenSim.Region.Environment.Modules.Framework
thisID++; thisID++;
} }
} }
OSDMap events = new OSDMap(); LLSDMap events = new LLSDMap();
events.Add("events", array); events.Add("events", array);
events.Add("id", new LLSDInteger(thisID)); events.Add("id", new LLSDInteger(thisID));
@ -512,7 +512,7 @@ namespace OpenSim.Region.Environment.Modules.Framework
{ {
//return new LLSD(); //return new LLSD();
} }
return new OSDString("shutdown404!"); return new LLSDString("shutdown404!");
} }
} }
} }

108
OpenSim/Region/Environment/Modules/Framework/EventQueueHelper.cs
View File

@ -52,70 +52,70 @@ namespace OpenSim.Region.Environment
}; };
} }
public static OSD buildEvent(string eventName, OSD eventBody) public static LLSD buildEvent(string eventName, LLSD eventBody)
{ {
OSDMap llsdEvent = new OSDMap(2); LLSDMap llsdEvent = new LLSDMap(2);
llsdEvent.Add("message", new OSDString(eventName)); llsdEvent.Add("message", new LLSDString(eventName));
llsdEvent.Add("body", eventBody); llsdEvent.Add("body", eventBody);
return llsdEvent; return llsdEvent;
} }
public static OSD EnableSimulator(ulong Handle, IPEndPoint endPoint) public static LLSD EnableSimulator(ulong Handle, IPEndPoint endPoint)
{ {
OSDMap llsdSimInfo = new OSDMap(3); LLSDMap llsdSimInfo = new LLSDMap(3);
llsdSimInfo.Add("Handle", new OSDBinary(regionHandleToByteArray(Handle))); llsdSimInfo.Add("Handle", new LLSDBinary(regionHandleToByteArray(Handle)));
llsdSimInfo.Add("IP", new OSDBinary(endPoint.Address.GetAddressBytes())); llsdSimInfo.Add("IP", new LLSDBinary(endPoint.Address.GetAddressBytes()));
llsdSimInfo.Add("Port", new OSDInteger(endPoint.Port)); llsdSimInfo.Add("Port", new LLSDInteger(endPoint.Port));
OSDArray arr = new OSDArray(1); LLSDArray arr = new LLSDArray(1);
arr.Add(llsdSimInfo); arr.Add(llsdSimInfo);
OSDMap llsdBody = new OSDMap(1); LLSDMap llsdBody = new LLSDMap(1);
llsdBody.Add("SimulatorInfo", arr); llsdBody.Add("SimulatorInfo", arr);
return buildEvent("EnableSimulator", llsdBody); return buildEvent("EnableSimulator", llsdBody);
} }
public static OSD CrossRegion(ulong Handle, Vector3 pos, Vector3 lookAt, public static LLSD CrossRegion(ulong Handle, Vector3 pos, Vector3 lookAt,
IPEndPoint newRegionExternalEndPoint, IPEndPoint newRegionExternalEndPoint,
string capsURL, UUID AgentID, UUID SessionID) string capsURL, UUID AgentID, UUID SessionID)
{ {
OSDArray LookAtArr = new OSDArray(3); LLSDArray LookAtArr = new LLSDArray(3);
LookAtArr.Add(OSD.FromReal(lookAt.X)); LookAtArr.Add(LLSD.FromReal(lookAt.X));
LookAtArr.Add(OSD.FromReal(lookAt.Y)); LookAtArr.Add(LLSD.FromReal(lookAt.Y));
LookAtArr.Add(OSD.FromReal(lookAt.Z)); LookAtArr.Add(LLSD.FromReal(lookAt.Z));
OSDArray PositionArr = new OSDArray(3); LLSDArray PositionArr = new LLSDArray(3);
PositionArr.Add(OSD.FromReal(pos.X)); PositionArr.Add(LLSD.FromReal(pos.X));
PositionArr.Add(OSD.FromReal(pos.Y)); PositionArr.Add(LLSD.FromReal(pos.Y));
PositionArr.Add(OSD.FromReal(pos.Z)); PositionArr.Add(LLSD.FromReal(pos.Z));
OSDMap InfoMap = new OSDMap(2); LLSDMap InfoMap = new LLSDMap(2);
InfoMap.Add("LookAt", LookAtArr); InfoMap.Add("LookAt", LookAtArr);
InfoMap.Add("Position", PositionArr); InfoMap.Add("Position", PositionArr);
OSDArray InfoArr = new OSDArray(1); LLSDArray InfoArr = new LLSDArray(1);
InfoArr.Add(InfoMap); InfoArr.Add(InfoMap);
OSDMap AgentDataMap = new OSDMap(2); LLSDMap AgentDataMap = new LLSDMap(2);
AgentDataMap.Add("AgentID", OSD.FromUUID(AgentID)); AgentDataMap.Add("AgentID", LLSD.FromUUID(AgentID));
AgentDataMap.Add("SessionID", OSD.FromUUID(SessionID)); AgentDataMap.Add("SessionID", LLSD.FromUUID(SessionID));
OSDArray AgentDataArr = new OSDArray(1); LLSDArray AgentDataArr = new LLSDArray(1);
AgentDataArr.Add(AgentDataMap); AgentDataArr.Add(AgentDataMap);
OSDMap RegionDataMap = new OSDMap(4); LLSDMap RegionDataMap = new LLSDMap(4);
RegionDataMap.Add("RegionHandle", OSD.FromBinary(regionHandleToByteArray(Handle))); RegionDataMap.Add("RegionHandle", LLSD.FromBinary(regionHandleToByteArray(Handle)));
RegionDataMap.Add("SeedCapability", OSD.FromString(capsURL)); RegionDataMap.Add("SeedCapability", LLSD.FromString(capsURL));
RegionDataMap.Add("SimIP", OSD.FromBinary(newRegionExternalEndPoint.Address.GetAddressBytes())); RegionDataMap.Add("SimIP", LLSD.FromBinary(newRegionExternalEndPoint.Address.GetAddressBytes()));
RegionDataMap.Add("SimPort", OSD.FromInteger(newRegionExternalEndPoint.Port)); RegionDataMap.Add("SimPort", LLSD.FromInteger(newRegionExternalEndPoint.Port));
OSDArray RegionDataArr = new OSDArray(1); LLSDArray RegionDataArr = new LLSDArray(1);
RegionDataArr.Add(RegionDataMap); RegionDataArr.Add(RegionDataMap);
OSDMap llsdBody = new OSDMap(3); LLSDMap llsdBody = new LLSDMap(3);
llsdBody.Add("Info", InfoArr); llsdBody.Add("Info", InfoArr);
llsdBody.Add("AgentData", AgentDataArr); llsdBody.Add("AgentData", AgentDataArr);
llsdBody.Add("RegionData", RegionDataArr); llsdBody.Add("RegionData", RegionDataArr);
@ -123,49 +123,49 @@ namespace OpenSim.Region.Environment
return buildEvent("CrossedRegion", llsdBody); return buildEvent("CrossedRegion", llsdBody);
} }
public static OSD TeleportFinishEvent( public static LLSD TeleportFinishEvent(
ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint,
uint locationID, uint flags, string capsURL, UUID AgentID) uint locationID, uint flags, string capsURL, UUID AgentID)
{ {
OSDMap info = new OSDMap(); LLSDMap info = new LLSDMap();
info.Add("AgentID", OSD.FromUUID(AgentID)); info.Add("AgentID", LLSD.FromUUID(AgentID));
info.Add("LocationID", OSD.FromInteger(4)); // TODO what is this? info.Add("LocationID", LLSD.FromInteger(4)); // TODO what is this?
info.Add("RegionHandle", OSD.FromBinary(regionHandleToByteArray(regionHandle))); info.Add("RegionHandle", LLSD.FromBinary(regionHandleToByteArray(regionHandle)));
info.Add("SeedCapability", OSD.FromString(capsURL)); info.Add("SeedCapability", LLSD.FromString(capsURL));
info.Add("SimAccess", OSD.FromInteger(simAccess)); info.Add("SimAccess", LLSD.FromInteger(simAccess));
info.Add("SimIP", OSD.FromBinary(regionExternalEndPoint.Address.GetAddressBytes())); info.Add("SimIP", LLSD.FromBinary(regionExternalEndPoint.Address.GetAddressBytes()));
info.Add("SimPort", OSD.FromInteger(regionExternalEndPoint.Port)); info.Add("SimPort", LLSD.FromInteger(regionExternalEndPoint.Port));
info.Add("TeleportFlags", OSD.FromBinary(1L << 4)); // AgentManager.TeleportFlags.ViaLocation info.Add("TeleportFlags", LLSD.FromBinary(1L << 4)); // AgentManager.TeleportFlags.ViaLocation
OSDArray infoArr = new OSDArray(); LLSDArray infoArr = new LLSDArray();
infoArr.Add(info); infoArr.Add(info);
OSDMap body = new OSDMap(); LLSDMap body = new LLSDMap();
body.Add("Info", infoArr); body.Add("Info", infoArr);
return buildEvent("TeleportFinish", body); return buildEvent("TeleportFinish", body);
} }
public static OSD ScriptRunningReplyEvent(UUID objectID, UUID itemID, bool running, bool mono) public static LLSD ScriptRunningReplyEvent(UUID objectID, UUID itemID, bool running, bool mono)
{ {
OSDMap script = new OSDMap(); LLSDMap script = new LLSDMap();
script.Add("ObjectID", OSD.FromUUID(objectID)); script.Add("ObjectID", LLSD.FromUUID(objectID));
script.Add("ItemID", OSD.FromUUID(itemID)); script.Add("ItemID", LLSD.FromUUID(itemID));
script.Add("Running", OSD.FromBoolean(running)); script.Add("Running", LLSD.FromBoolean(running));
script.Add("Mono", OSD.FromBoolean(mono)); script.Add("Mono", LLSD.FromBoolean(mono));
OSDArray scriptArr = new OSDArray(); LLSDArray scriptArr = new LLSDArray();
scriptArr.Add(script); scriptArr.Add(script);
OSDMap body = new OSDMap(); LLSDMap body = new LLSDMap();
body.Add("Script", scriptArr); body.Add("Script", scriptArr);
return buildEvent("ScriptRunningReply", body); return buildEvent("ScriptRunningReply", body);
} }
public static OSD KeepAliveEvent() public static LLSD KeepAliveEvent()
{ {
return buildEvent("FAKEEVENT", new OSDMap()); return buildEvent("FAKEEVENT", new LLSDMap());
} }
} }
} }

270
OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
View File

@ -46,9 +46,9 @@ using OpenSim.Framework.Servers;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Environment.Scenes;
using OSD = OpenMetaverse.StructuredData.OSD; using LLSD = OpenMetaverse.StructuredData.LLSD;
using OSDMap = OpenMetaverse.StructuredData.OSDMap; using LLSDMap = OpenMetaverse.StructuredData.LLSDMap;
using OSDArray = OpenMetaverse.StructuredData.OSDArray; using LLSDArray = OpenMetaverse.StructuredData.LLSDArray;
namespace OpenSim.Region.Environment.Modules.InterGrid namespace OpenSim.Region.Environment.Modules.InterGrid
{ {
@ -218,7 +218,7 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
#endregion #endregion
public OSD ProcessRegionDomainSeed(string path, OSD request, string endpoint) public LLSD ProcessRegionDomainSeed(string path, LLSD request, string endpoint)
{ {
string[] pathSegments = path.Split('/'); string[] pathSegments = path.Split('/');
@ -234,11 +234,11 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
//m_log.InfoFormat("[OGP]: path {0}, segments {1} segment[1] {2} Last segment {3}", //m_log.InfoFormat("[OGP]: path {0}, segments {1} segment[1] {2} Last segment {3}",
// path, pathSegments.Length, pathSegments[1], pathSegments[pathSegments.Length - 1]); // path, pathSegments.Length, pathSegments[1], pathSegments[pathSegments.Length - 1]);
//return new OSDMap(); //return new LLSDMap();
} }
public OSD ProcessAgentDomainMessage(string path, OSD request, string endpoint) public LLSD ProcessAgentDomainMessage(string path, LLSD request, string endpoint)
{ {
// /agent/* // /agent/*
@ -288,7 +288,7 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
//return null; //return null;
} }
private OSD GenerateRezAvatarRequestMessage(string regionname) private LLSD GenerateRezAvatarRequestMessage(string regionname)
{ {
Scene region = null; Scene region = null;
bool usedroot = false; bool usedroot = false;
@ -319,7 +319,7 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
RegionInfo reg = region.RegionInfo; RegionInfo reg = region.RegionInfo;
OSDMap responseMap = new OSDMap(); LLSDMap responseMap = new LLSDMap();
string rezHttpProtocol = "http://"; string rezHttpProtocol = "http://";
//string regionCapsHttpProtocol = "http://"; //string regionCapsHttpProtocol = "http://";
string httpaddr = reg.ExternalHostName; string httpaddr = reg.ExternalHostName;
@ -347,9 +347,9 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
httpaddr = httpsCN; httpaddr = httpsCN;
} }
responseMap["connect"] = OSD.FromBoolean(true); responseMap["connect"] = LLSD.FromBoolean(true);
OSDMap capabilitiesMap = new OSDMap(); LLSDMap capabilitiesMap = new LLSDMap();
capabilitiesMap["rez_avatar/request"] = OSD.FromString(rezHttpProtocol + httpaddr + ":" + urlport + requestpath); capabilitiesMap["rez_avatar/request"] = LLSD.FromString(rezHttpProtocol + httpaddr + ":" + urlport + requestpath);
responseMap["capabilities"] = capabilitiesMap; responseMap["capabilities"] = capabilitiesMap;
return responseMap; return responseMap;
@ -376,11 +376,11 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
} }
public OSD RequestRezAvatarMethod(string path, OSD request) public LLSD RequestRezAvatarMethod(string path, LLSD request)
{ {
//System.Console.WriteLine("[REQUESTREZAVATAR]: " + request.ToString()); //System.Console.WriteLine("[REQUESTREZAVATAR]: " + request.ToString());
OSDMap requestMap = (OSDMap)request; LLSDMap requestMap = (LLSDMap)request;
Scene homeScene = null; Scene homeScene = null;
@ -441,27 +441,27 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
UpdateOGPState(LocalAgentID, userState); UpdateOGPState(LocalAgentID, userState);
OSDMap responseMap = new OSDMap(); LLSDMap responseMap = new LLSDMap();
if (RemoteAgentID == UUID.Zero) if (RemoteAgentID == UUID.Zero)
{ {
responseMap["connect"] = OSD.FromBoolean(false); responseMap["connect"] = LLSD.FromBoolean(false);
responseMap["message"] = OSD.FromString("No agent ID was specified in rez_avatar/request"); responseMap["message"] = LLSD.FromString("No agent ID was specified in rez_avatar/request");
m_log.Error("[OGP]: rez_avatar/request failed because no avatar UUID was provided in the request body"); m_log.Error("[OGP]: rez_avatar/request failed because no avatar UUID was provided in the request body");
return responseMap; return responseMap;
} }
responseMap["sim_host"] = OSD.FromString(reg.ExternalHostName); responseMap["sim_host"] = LLSD.FromString(reg.ExternalHostName);
// DEPRECIATED // DEPRECIATED
responseMap["sim_ip"] = OSD.FromString(Util.GetHostFromDNS(reg.ExternalHostName).ToString()); responseMap["sim_ip"] = LLSD.FromString(Util.GetHostFromDNS(reg.ExternalHostName).ToString());
responseMap["connect"] = OSD.FromBoolean(true); responseMap["connect"] = LLSD.FromBoolean(true);
responseMap["sim_port"] = OSD.FromInteger(reg.InternalEndPoint.Port); responseMap["sim_port"] = LLSD.FromInteger(reg.InternalEndPoint.Port);
responseMap["region_x"] = OSD.FromInteger(reg.RegionLocX * (uint)Constants.RegionSize); // LLX responseMap["region_x"] = LLSD.FromInteger(reg.RegionLocX * (uint)Constants.RegionSize); // LLX
responseMap["region_y"] = OSD.FromInteger(reg.RegionLocY * (uint)Constants.RegionSize); // LLY responseMap["region_y"] = LLSD.FromInteger(reg.RegionLocY * (uint)Constants.RegionSize); // LLY
responseMap["region_id"] = OSD.FromUUID(reg.originRegionID); responseMap["region_id"] = LLSD.FromUUID(reg.originRegionID);
responseMap["sim_access"] = OSD.FromString((reg.RegionSettings.Maturity == 1) ? "Mature" : "PG"); responseMap["sim_access"] = LLSD.FromString((reg.RegionSettings.Maturity == 1) ? "Mature" : "PG");
// Generate a dummy agent for the user so we can get back a CAPS path // Generate a dummy agent for the user so we can get back a CAPS path
AgentCircuitData agentData = new AgentCircuitData(); AgentCircuitData agentData = new AgentCircuitData();
@ -575,14 +575,14 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
// DEPRECIATED // DEPRECIATED
responseMap["seed_capability"] = OSD.FromString(regionCapsHttpProtocol + httpaddr + ":" + reg.HttpPort + "/CAPS/" + userCap.CapsObjectPath + "0000/"); responseMap["seed_capability"] = LLSD.FromString(regionCapsHttpProtocol + httpaddr + ":" + reg.HttpPort + "/CAPS/" + userCap.CapsObjectPath + "0000/");
// REPLACEMENT // REPLACEMENT
responseMap["region_seed_capability"] = OSD.FromString(regionCapsHttpProtocol + httpaddr + ":" + reg.HttpPort + "/CAPS/" + userCap.CapsObjectPath + "0000/"); responseMap["region_seed_capability"] = LLSD.FromString(regionCapsHttpProtocol + httpaddr + ":" + reg.HttpPort + "/CAPS/" + userCap.CapsObjectPath + "0000/");
responseMap["rez_avatar"] = OSD.FromString(rezHttpProtocol + httpaddr + ":" + urlport + rezAvatarPath); responseMap["rez_avatar"] = LLSD.FromString(rezHttpProtocol + httpaddr + ":" + urlport + rezAvatarPath);
responseMap["rez_avatar/rez"] = OSD.FromString(rezHttpProtocol + httpaddr + ":" + urlport + rezAvatarPath); responseMap["rez_avatar/rez"] = LLSD.FromString(rezHttpProtocol + httpaddr + ":" + urlport + rezAvatarPath);
responseMap["rez_avatar/derez"] = OSD.FromString(rezHttpProtocol + httpaddr + ":" + urlport + derezAvatarPath); responseMap["rez_avatar/derez"] = LLSD.FromString(rezHttpProtocol + httpaddr + ":" + urlport + derezAvatarPath);
// Add the user to the list of CAPS that are outstanding. // Add the user to the list of CAPS that are outstanding.
// well allow the caps hosts in this dictionary // well allow the caps hosts in this dictionary
@ -605,27 +605,27 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
return responseMap; return responseMap;
} }
public OSD RezAvatarMethod(string path, OSD request) public LLSD RezAvatarMethod(string path, LLSD request)
{ {
m_log.WarnFormat("[REZAVATAR]: {0}", request.ToString()); m_log.WarnFormat("[REZAVATAR]: {0}", request.ToString());
OSDMap responseMap = new OSDMap(); LLSDMap responseMap = new LLSDMap();
AgentCircuitData userData = null; AgentCircuitData userData = null;
// Only people we've issued a cap can go further // Only people we've issued a cap can go further
if (TryGetAgentCircuitData(path,out userData)) if (TryGetAgentCircuitData(path,out userData))
{ {
OSDMap requestMap = (OSDMap)request; LLSDMap requestMap = (LLSDMap)request;
// take these values to start. There's a few more // take these values to start. There's a few more
UUID SecureSessionID=requestMap["secure_session_id"].AsUUID(); UUID SecureSessionID=requestMap["secure_session_id"].AsUUID();
UUID SessionID = requestMap["session_id"].AsUUID(); UUID SessionID = requestMap["session_id"].AsUUID();
int circuitcode = requestMap["circuit_code"].AsInteger(); int circuitcode = requestMap["circuit_code"].AsInteger();
OSDArray Parameter = new OSDArray(); LLSDArray Parameter = new LLSDArray();
if (requestMap.ContainsKey("parameter")) if (requestMap.ContainsKey("parameter"))
{ {
Parameter = (OSDArray)requestMap["parameter"]; Parameter = (LLSDArray)((LLSD)requestMap["parameter"]);
} }
//int version = 1; //int version = 1;
@ -636,7 +636,7 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
for (int i = 0; i < Parameter.Count; i++) for (int i = 0; i < Parameter.Count; i++)
{ {
OSDMap item = (OSDMap)Parameter[i]; LLSDMap item = (LLSDMap)Parameter[i];
// if (item.ContainsKey("version")) // if (item.ContainsKey("version"))
// { // {
// version = item["version"].AsInteger(); // version = item["version"].AsInteger();
@ -714,15 +714,15 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
RegionInfo reg = homeScene.RegionInfo; RegionInfo reg = homeScene.RegionInfo;
// Dummy positional and look at info.. we don't have it. // Dummy positional and look at info.. we don't have it.
OSDArray PositionArray = new OSDArray(); LLSDArray PositionArray = new LLSDArray();
PositionArray.Add(OSD.FromInteger(128)); PositionArray.Add(LLSD.FromInteger(128));
PositionArray.Add(OSD.FromInteger(128)); PositionArray.Add(LLSD.FromInteger(128));
PositionArray.Add(OSD.FromInteger(40)); PositionArray.Add(LLSD.FromInteger(40));
OSDArray LookAtArray = new OSDArray(); LLSDArray LookAtArray = new LLSDArray();
LookAtArray.Add(OSD.FromInteger(1)); LookAtArray.Add(LLSD.FromInteger(1));
LookAtArray.Add(OSD.FromInteger(1)); LookAtArray.Add(LLSD.FromInteger(1));
LookAtArray.Add(OSD.FromInteger(1)); LookAtArray.Add(LLSD.FromInteger(1));
// Our region's X and Y position in OpenSimulator space. // Our region's X and Y position in OpenSimulator space.
uint fooX = reg.RegionLocX; uint fooX = reg.RegionLocX;
@ -732,31 +732,31 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
m_log.InfoFormat("[OGO]: region UUID {0} ", reg.RegionID); m_log.InfoFormat("[OGO]: region UUID {0} ", reg.RegionID);
// Convert the X and Y position to LL space // Convert the X and Y position to LL space
responseMap["region_x"] = OSD.FromInteger(fooX * (uint)Constants.RegionSize); // convert it to LL X responseMap["region_x"] = LLSD.FromInteger(fooX * (uint)Constants.RegionSize); // convert it to LL X
responseMap["region_y"] = OSD.FromInteger(fooY * (uint)Constants.RegionSize); // convert it to LL Y responseMap["region_y"] = LLSD.FromInteger(fooY * (uint)Constants.RegionSize); // convert it to LL Y
// Give em a new seed capability // Give em a new seed capability
responseMap["seed_capability"] = OSD.FromString("http://" + reg.ExternalHostName + ":" + reg.HttpPort + "/CAPS/" + userCap.CapsObjectPath + "0000/"); responseMap["seed_capability"] = LLSD.FromString("http://" + reg.ExternalHostName + ":" + reg.HttpPort + "/CAPS/" + userCap.CapsObjectPath + "0000/");
responseMap["region"] = OSD.FromUUID(reg.originRegionID); responseMap["region"] = LLSD.FromUUID(reg.originRegionID);
responseMap["look_at"] = LookAtArray; responseMap["look_at"] = LookAtArray;
responseMap["sim_port"] = OSD.FromInteger(reg.InternalEndPoint.Port); responseMap["sim_port"] = LLSD.FromInteger(reg.InternalEndPoint.Port);
responseMap["sim_host"] = OSD.FromString(reg.ExternalHostName);// + ":" + reg.InternalEndPoint.Port.ToString()); responseMap["sim_host"] = LLSD.FromString(reg.ExternalHostName);// + ":" + reg.InternalEndPoint.Port.ToString());
// DEPRECIATED // DEPRECIATED
responseMap["sim_ip"] = OSD.FromString(Util.GetHostFromDNS(reg.ExternalHostName).ToString()); responseMap["sim_ip"] = LLSD.FromString(Util.GetHostFromDNS(reg.ExternalHostName).ToString());
responseMap["session_id"] = OSD.FromUUID(SessionID); responseMap["session_id"] = LLSD.FromUUID(SessionID);
responseMap["secure_session_id"] = OSD.FromUUID(SecureSessionID); responseMap["secure_session_id"] = LLSD.FromUUID(SecureSessionID);
responseMap["circuit_code"] = OSD.FromInteger(circuitcode); responseMap["circuit_code"] = LLSD.FromInteger(circuitcode);
responseMap["position"] = PositionArray; responseMap["position"] = PositionArray;
responseMap["region_id"] = OSD.FromUUID(reg.originRegionID); responseMap["region_id"] = LLSD.FromUUID(reg.originRegionID);
responseMap["sim_access"] = OSD.FromString("Mature"); responseMap["sim_access"] = LLSD.FromString("Mature");
responseMap["connect"] = OSD.FromBoolean(true); responseMap["connect"] = LLSD.FromBoolean(true);
@ -767,12 +767,12 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
return responseMap; return responseMap;
} }
public OSD DerezAvatarMethod(string path, OSD request) public LLSD DerezAvatarMethod(string path, LLSD request)
{ {
m_log.ErrorFormat("DerezPath: {0}, Request: {1}", path, request.ToString()); m_log.ErrorFormat("DerezPath: {0}, Request: {1}", path, request.ToString());
//LLSD llsdResponse = null; //LLSD llsdResponse = null;
OSDMap responseMap = new OSDMap(); LLSDMap responseMap = new LLSDMap();
string[] PathArray = path.Split('/'); string[] PathArray = path.Split('/');
m_log.InfoFormat("[OGP]: prefix {0}, uuid {1}, suffix {2}", PathArray[1], PathArray[2], PathArray[3]); m_log.InfoFormat("[OGP]: prefix {0}, uuid {1}, suffix {2}", PathArray[1], PathArray[2], PathArray[3]);
@ -790,34 +790,34 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
OGPState userState = GetOGPState(LocalID); OGPState userState = GetOGPState(LocalID);
if (userState.agent_id != UUID.Zero) if (userState.agent_id != UUID.Zero)
{ {
//OSDMap outboundRequestMap = new OSDMap(); //LLSDMap outboundRequestMap = new LLSDMap();
OSDMap inboundRequestMap = (OSDMap)request; LLSDMap inboundRequestMap = (LLSDMap)request;
string rezAvatarString = inboundRequestMap["rez_avatar"].AsString(); string rezAvatarString = inboundRequestMap["rez_avatar"].AsString();
if (rezAvatarString.Length == 0) if (rezAvatarString.Length == 0)
{ {
rezAvatarString = inboundRequestMap["rez_avatar/rez"].AsString(); rezAvatarString = inboundRequestMap["rez_avatar/rez"].AsString();
} }
OSDArray LookAtArray = new OSDArray(); LLSDArray LookAtArray = new LLSDArray();
LookAtArray.Add(OSD.FromInteger(1)); LookAtArray.Add(LLSD.FromInteger(1));
LookAtArray.Add(OSD.FromInteger(1)); LookAtArray.Add(LLSD.FromInteger(1));
LookAtArray.Add(OSD.FromInteger(1)); LookAtArray.Add(LLSD.FromInteger(1));
OSDArray PositionArray = new OSDArray(); LLSDArray PositionArray = new LLSDArray();
PositionArray.Add(OSD.FromInteger(128)); PositionArray.Add(LLSD.FromInteger(128));
PositionArray.Add(OSD.FromInteger(128)); PositionArray.Add(LLSD.FromInteger(128));
PositionArray.Add(OSD.FromInteger(40)); PositionArray.Add(LLSD.FromInteger(40));
OSDArray lookArray = new OSDArray(); LLSDArray lookArray = new LLSDArray();
lookArray.Add(OSD.FromInteger(128)); lookArray.Add(LLSD.FromInteger(128));
lookArray.Add(OSD.FromInteger(128)); lookArray.Add(LLSD.FromInteger(128));
lookArray.Add(OSD.FromInteger(40)); lookArray.Add(LLSD.FromInteger(40));
responseMap["connect"] = OSD.FromBoolean(true);// it's okay to give this user up responseMap["connect"] = LLSD.FromBoolean(true);// it's okay to give this user up
responseMap["look_at"] = LookAtArray; responseMap["look_at"] = LookAtArray;
m_log.WarnFormat("[OGP]: Invoking rez_avatar on host:{0} for avatar: {1} {2}", rezAvatarString, userState.first_name, userState.last_name); m_log.WarnFormat("[OGP]: Invoking rez_avatar on host:{0} for avatar: {1} {2}", rezAvatarString, userState.first_name, userState.last_name);
OSDMap rezResponseMap = invokeRezAvatarCap(responseMap, rezAvatarString,userState); LLSDMap rezResponseMap = invokeRezAvatarCap(responseMap, rezAvatarString,userState);
// If invoking it returned an error, parse and end // If invoking it returned an error, parse and end
if (rezResponseMap.ContainsKey("connect")) if (rezResponseMap.ContainsKey("connect"))
@ -852,34 +852,34 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
int rrY = rezResponseMap["region_y"].AsInteger(); int rrY = rezResponseMap["region_y"].AsInteger();
m_log.ErrorFormat("X:{0}, Y:{1}", rrX, rrY); m_log.ErrorFormat("X:{0}, Y:{1}", rrX, rrY);
UUID rrRID = rezResponseMap["region_id"].AsUUID(); UUID rrRID = rezResponseMap["region_id"].AsUUID();
OSDArray RezResponsePositionArray = null; LLSDArray RezResponsePositionArray = null;
string rrAccess = rezResponseMap["sim_access"].AsString(); string rrAccess = rezResponseMap["sim_access"].AsString();
if (rezResponseMap.ContainsKey("position")) if (rezResponseMap.ContainsKey("position"))
{ {
RezResponsePositionArray = (OSDArray)rezResponseMap["position"]; RezResponsePositionArray = (LLSDArray)rezResponseMap["position"];
} }
// DEPRECIATED // DEPRECIATED
responseMap["seed_capability"] = OSD.FromString(rezRespSeedCap); responseMap["seed_capability"] = LLSD.FromString(rezRespSeedCap);
// REPLACEMENT r3 // REPLACEMENT r3
responseMap["region_seed_capability"] = OSD.FromString(rezRespSeedCap); responseMap["region_seed_capability"] = LLSD.FromString(rezRespSeedCap);
// DEPRECIATED // DEPRECIATED
responseMap["sim_ip"] = OSD.FromString(Util.GetHostFromDNS(rezRespSim_ip).ToString()); responseMap["sim_ip"] = LLSD.FromString(Util.GetHostFromDNS(rezRespSim_ip).ToString());
responseMap["sim_host"] = OSD.FromString(rezRespSim_host); responseMap["sim_host"] = LLSD.FromString(rezRespSim_host);
responseMap["sim_port"] = OSD.FromInteger(rrPort); responseMap["sim_port"] = LLSD.FromInteger(rrPort);
responseMap["region_x"] = OSD.FromInteger(rrX ); responseMap["region_x"] = LLSD.FromInteger(rrX );
responseMap["region_y"] = OSD.FromInteger(rrY ); responseMap["region_y"] = LLSD.FromInteger(rrY );
responseMap["region_id"] = OSD.FromUUID(rrRID); responseMap["region_id"] = LLSD.FromUUID(rrRID);
responseMap["sim_access"] = OSD.FromString(rrAccess); responseMap["sim_access"] = LLSD.FromString(rrAccess);
if (RezResponsePositionArray != null) if (RezResponsePositionArray != null)
{ {
responseMap["position"] = RezResponsePositionArray; responseMap["position"] = RezResponsePositionArray;
} }
responseMap["look_at"] = lookArray; responseMap["look_at"] = lookArray;
responseMap["connect"] = OSD.FromBoolean(true); responseMap["connect"] = LLSD.FromBoolean(true);
ShutdownConnection(LocalID,this); ShutdownConnection(LocalID,this);
// PLEASE STOP CHANGING THIS TO an M_LOG, M_LOG DOESN'T WORK ON MULTILINE .TOSTRINGS // PLEASE STOP CHANGING THIS TO an M_LOG, M_LOG DOESN'T WORK ON MULTILINE .TOSTRINGS
@ -899,7 +899,7 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
//return responseMap; //return responseMap;
} }
private OSDMap invokeRezAvatarCap(OSDMap responseMap, string CapAddress, OGPState userState) private LLSDMap invokeRezAvatarCap(LLSDMap responseMap, string CapAddress, OGPState userState)
{ {
Scene reg = GetRootScene(); Scene reg = GetRootScene();
@ -907,38 +907,38 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
DeRezRequest.Method = "POST"; DeRezRequest.Method = "POST";
DeRezRequest.ContentType = "application/xml+llsd"; DeRezRequest.ContentType = "application/xml+llsd";
OSDMap RAMap = new OSDMap(); LLSDMap RAMap = new LLSDMap();
OSDMap AgentParms = new OSDMap(); LLSDMap AgentParms = new LLSDMap();
OSDMap RegionParms = new OSDMap(); LLSDMap RegionParms = new LLSDMap();
OSDArray Parameter = new OSDArray(2); LLSDArray Parameter = new LLSDArray(2);
OSDMap version = new OSDMap(); LLSDMap version = new LLSDMap();
version["version"] = OSD.FromInteger(userState.src_version); version["version"] = LLSD.FromInteger(userState.src_version);
Parameter.Add(version); Parameter.Add((LLSD)version);
OSDMap SrcData = new OSDMap(); LLSDMap SrcData = new LLSDMap();
SrcData["estate_id"] = OSD.FromInteger(reg.RegionInfo.EstateSettings.EstateID); SrcData["estate_id"] = LLSD.FromInteger(reg.RegionInfo.EstateSettings.EstateID);
SrcData["parent_estate_id"] = OSD.FromInteger((reg.RegionInfo.EstateSettings.ParentEstateID == 100 ? 1 : reg.RegionInfo.EstateSettings.ParentEstateID)); SrcData["parent_estate_id"] = LLSD.FromInteger((reg.RegionInfo.EstateSettings.ParentEstateID == 100 ? 1 : reg.RegionInfo.EstateSettings.ParentEstateID));
SrcData["region_id"] = OSD.FromUUID(reg.RegionInfo.originRegionID); SrcData["region_id"] = LLSD.FromUUID(reg.RegionInfo.originRegionID);
SrcData["visible_to_parent"] = OSD.FromBoolean(userState.visible_to_parent); SrcData["visible_to_parent"] = LLSD.FromBoolean(userState.visible_to_parent);
Parameter.Add(SrcData); Parameter.Add((LLSD)SrcData);
AgentParms["first_name"] = OSD.FromString(userState.first_name); AgentParms["first_name"] = LLSD.FromString(userState.first_name);
AgentParms["last_name"] = OSD.FromString(userState.last_name); AgentParms["last_name"] = LLSD.FromString(userState.last_name);
AgentParms["agent_id"] = OSD.FromUUID(userState.agent_id); AgentParms["agent_id"] = LLSD.FromUUID(userState.agent_id);
RegionParms["region_id"] = OSD.FromUUID(userState.region_id); RegionParms["region_id"] = LLSD.FromUUID(userState.region_id);
AgentParms["circuit_code"] = OSD.FromInteger(userState.circuit_code); AgentParms["circuit_code"] = LLSD.FromInteger(userState.circuit_code);
AgentParms["secure_session_id"] = OSD.FromUUID(userState.secure_session_id); AgentParms["secure_session_id"] = LLSD.FromUUID(userState.secure_session_id);
AgentParms["session_id"] = OSD.FromUUID(userState.session_id); AgentParms["session_id"] = LLSD.FromUUID(userState.session_id);
AgentParms["agent_access"] = OSD.FromBoolean(userState.agent_access); AgentParms["agent_access"] = LLSD.FromBoolean(userState.agent_access);
AgentParms["god_level"] = OSD.FromInteger(userState.god_level); AgentParms["god_level"] = LLSD.FromInteger(userState.god_level);
AgentParms["god_overide"] = OSD.FromBoolean(userState.god_overide); AgentParms["god_overide"] = LLSD.FromBoolean(userState.god_overide);
AgentParms["identified"] = OSD.FromBoolean(userState.identified); AgentParms["identified"] = LLSD.FromBoolean(userState.identified);
AgentParms["transacted"] = OSD.FromBoolean(userState.transacted); AgentParms["transacted"] = LLSD.FromBoolean(userState.transacted);
AgentParms["age_verified"] = OSD.FromBoolean(userState.age_verified); AgentParms["age_verified"] = LLSD.FromBoolean(userState.age_verified);
AgentParms["limited_to_estate"] = OSD.FromInteger(userState.limited_to_estate); AgentParms["limited_to_estate"] = LLSD.FromInteger(userState.limited_to_estate);
AgentParms["inventory_host"] = OSD.FromString(userState.inventory_host); AgentParms["inventory_host"] = LLSD.FromString(userState.inventory_host);
// version 1 // version 1
RAMap = AgentParms; RAMap = AgentParms;
@ -951,11 +951,11 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
string RAMapString = RAMap.ToString(); string RAMapString = RAMap.ToString();
m_log.InfoFormat("[OGP] RAMap string {0}", RAMapString); m_log.InfoFormat("[OGP] RAMap string {0}", RAMapString);
OSD LLSDofRAMap = RAMap; // RENAME if this works LLSD LLSDofRAMap = RAMap; // RENAME if this works
m_log.InfoFormat("[OGP]: LLSD of map as string was {0}", LLSDofRAMap.ToString()); m_log.InfoFormat("[OGP]: LLSD of map as string was {0}", LLSDofRAMap.ToString());
//m_log.InfoFormat("[OGP]: LLSD+XML: {0}", LLSDParser.SerializeXmlString(LLSDofRAMap)); //m_log.InfoFormat("[OGP]: LLSD+XML: {0}", LLSDParser.SerializeXmlString(LLSDofRAMap));
byte[] buffer = OSDParser.SerializeLLSDXmlBytes(LLSDofRAMap); byte[] buffer = LLSDParser.SerializeXmlBytes(LLSDofRAMap);
//string bufferDump = System.Text.Encoding.ASCII.GetString(buffer); //string bufferDump = System.Text.Encoding.ASCII.GetString(buffer);
//m_log.InfoFormat("[OGP]: buffer form is {0}",bufferDump); //m_log.InfoFormat("[OGP]: buffer form is {0}",bufferDump);
@ -973,7 +973,7 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
catch (WebException ex) catch (WebException ex)
{ {
m_log.InfoFormat("[OGP] Bad send on de_rez_avatar {0}", ex.Message); m_log.InfoFormat("[OGP] Bad send on de_rez_avatar {0}", ex.Message);
responseMap["connect"] = OSD.FromBoolean(false); responseMap["connect"] = LLSD.FromBoolean(false);
return responseMap; return responseMap;
} }
@ -997,21 +997,21 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
catch (WebException ex) catch (WebException ex)
{ {
m_log.InfoFormat("[OGP]: exception on read after send of rez avatar {0}", ex.Message); m_log.InfoFormat("[OGP]: exception on read after send of rez avatar {0}", ex.Message);
responseMap["connect"] = OSD.FromBoolean(false); responseMap["connect"] = LLSD.FromBoolean(false);
return responseMap; return responseMap;
} }
OSD rezResponse = null; LLSD rezResponse = null;
try try
{ {
rezResponse = OSDParser.DeserializeLLSDXml(rez_avatar_reply); rezResponse = LLSDParser.DeserializeXml(rez_avatar_reply);
responseMap = (OSDMap)rezResponse; responseMap = (LLSDMap)rezResponse;
} }
catch (Exception ex) catch (Exception ex)
{ {
m_log.InfoFormat("[OGP]: exception on parse of rez reply {0}", ex.Message); m_log.InfoFormat("[OGP]: exception on parse of rez reply {0}", ex.Message);
responseMap["connect"] = OSD.FromBoolean(false); responseMap["connect"] = LLSD.FromBoolean(false);
return responseMap; return responseMap;
} }
@ -1019,22 +1019,22 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
return responseMap; return responseMap;
} }
public OSD GenerateNoHandlerMessage() public LLSD GenerateNoHandlerMessage()
{ {
OSDMap map = new OSDMap(); LLSDMap map = new LLSDMap();
map["reason"] = OSD.FromString("LLSDRequest"); map["reason"] = LLSD.FromString("LLSDRequest");
map["message"] = OSD.FromString("No handler registered for LLSD Requests"); map["message"] = LLSD.FromString("No handler registered for LLSD Requests");
map["login"] = OSD.FromString("false"); map["login"] = LLSD.FromString("false");
map["connect"] = OSD.FromString("false"); map["connect"] = LLSD.FromString("false");
return map; return map;
} }
public OSD GenerateNoStateMessage(UUID passedAvatar) public LLSD GenerateNoStateMessage(UUID passedAvatar)
{ {
OSDMap map = new OSDMap(); LLSDMap map = new LLSDMap();
map["reason"] = OSD.FromString("derez failed"); map["reason"] = LLSD.FromString("derez failed");
map["message"] = OSD.FromString("Unable to locate OGP state for avatar " + passedAvatar.ToString()); map["message"] = LLSD.FromString("Unable to locate OGP state for avatar " + passedAvatar.ToString());
map["login"] = OSD.FromString("false"); map["login"] = LLSD.FromString("false");
map["connect"] = OSD.FromString("false"); map["connect"] = LLSD.FromString("false");
return map; return map;
} }
private bool TryGetAgentCircuitData(string path, out AgentCircuitData userdata) private bool TryGetAgentCircuitData(string path, out AgentCircuitData userdata)

4
OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
View File

@ -369,7 +369,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
List<ParcelManager.ParcelAccessEntry> toRemove = new List<ParcelManager.ParcelAccessEntry>(); List<ParcelManager.ParcelAccessEntry> toRemove = new List<ParcelManager.ParcelAccessEntry>();
foreach (ParcelManager.ParcelAccessEntry entry in newData.ParcelAccessList) foreach (ParcelManager.ParcelAccessEntry entry in newData.ParcelAccessList)
{ {
if (entry.Flags == (AccessList)flags) if (entry.Flags == (AccessList) flags)
{ {
toRemove.Add(entry); toRemove.Add(entry);
} }
@ -384,7 +384,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
ParcelManager.ParcelAccessEntry temp = new ParcelManager.ParcelAccessEntry(); ParcelManager.ParcelAccessEntry temp = new ParcelManager.ParcelAccessEntry();
temp.AgentID = entry.AgentID; temp.AgentID = entry.AgentID;
temp.Time = new DateTime(); //Pointless? Yes. temp.Time = new DateTime(); //Pointless? Yes.
temp.Flags = (AccessList)flags; temp.Flags = (AccessList) flags;
if (!newData.ParcelAccessList.Contains(temp)) if (!newData.ParcelAccessList.Contains(temp))
{ {

112
OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs
View File

@ -48,9 +48,9 @@ using OpenSim.Region.Environment.Scenes;
using OpenSim.Region.Environment.Types; using OpenSim.Region.Environment.Types;
using Caps = OpenSim.Framework.Communications.Capabilities.Caps; using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
using OSD = OpenMetaverse.StructuredData.OSD; using LLSD = OpenMetaverse.StructuredData.LLSD;
using OSDMap = OpenMetaverse.StructuredData.OSDMap; using LLSDMap = OpenMetaverse.StructuredData.LLSDMap;
using OSDArray = OpenMetaverse.StructuredData.OSDArray; using LLSDArray = OpenMetaverse.StructuredData.LLSDArray;
namespace OpenSim.Region.Environment.Modules.World.WorldMap namespace OpenSim.Region.Environment.Modules.World.WorldMap
{ {
@ -202,7 +202,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
} }
} }
LLSDMapLayerResponse mapResponse = new LLSDMapLayerResponse(); LLSDMapLayerResponse mapResponse = new LLSDMapLayerResponse();
mapResponse.LayerData.Array.Add(GetOSDMapLayerResponse()); mapResponse.LayerData.Array.Add(GetLLSDMapLayerResponse());
return mapResponse.ToString(); return mapResponse.ToString();
} }
@ -215,7 +215,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
{ {
m_log.Debug("[CAPS]: MapLayer Request in region: " + m_scene.RegionInfo.RegionName); m_log.Debug("[CAPS]: MapLayer Request in region: " + m_scene.RegionInfo.RegionName);
LLSDMapLayerResponse mapResponse = new LLSDMapLayerResponse(); LLSDMapLayerResponse mapResponse = new LLSDMapLayerResponse();
mapResponse.LayerData.Array.Add(GetOSDMapLayerResponse()); mapResponse.LayerData.Array.Add(GetLLSDMapLayerResponse());
return mapResponse; return mapResponse;
} }
@ -223,9 +223,9 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
/// ///
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
protected static OSDMapLayer GetOSDMapLayerResponse() protected static LLSDMapLayer GetLLSDMapLayerResponse()
{ {
OSDMapLayer mapLayer = new OSDMapLayer(); LLSDMapLayer mapLayer = new LLSDMapLayer();
mapLayer.Right = 5000; mapLayer.Right = 5000;
mapLayer.Top = 5000; mapLayer.Top = 5000;
mapLayer.ImageID = new UUID("00000000-0000-1111-9999-000000000006"); mapLayer.ImageID = new UUID("00000000-0000-1111-9999-000000000006");
@ -321,7 +321,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
} }
uint xstart = 0; uint xstart = 0;
uint ystart = 0; uint ystart = 0;
Utils.LongToUInts(m_scene.RegionInfo.RegionHandle, out xstart, out ystart); Helpers.LongToUInts(m_scene.RegionInfo.RegionHandle, out xstart, out ystart);
if (itemtype == 6) // we only sevice 6 right now (avatar green dots) if (itemtype == 6) // we only sevice 6 right now (avatar green dots)
{ {
if (regionhandle == 0 || regionhandle == m_scene.RegionInfo.RegionHandle) if (regionhandle == 0 || regionhandle == m_scene.RegionInfo.RegionHandle)
@ -407,7 +407,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
if (dorequest) if (dorequest)
{ {
OSDMap response = RequestMapItemsAsync("", st.agentID, st.flags, st.EstateID, st.godlike, st.itemtype, st.regionhandle); LLSDMap response = RequestMapItemsAsync("", st.agentID, st.flags, st.EstateID, st.godlike, st.itemtype, st.regionhandle);
RequestMapItemsCompleted(response); RequestMapItemsCompleted(response);
} }
} }
@ -433,8 +433,8 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
/// <summary> /// <summary>
/// Sends the mapitem response to the IClientAPI /// Sends the mapitem response to the IClientAPI
/// </summary> /// </summary>
/// <param name="response">The OSDMap Response for the mapitem</param> /// <param name="response">The LLSDMap Response for the mapitem</param>
private void RequestMapItemsCompleted(OSDMap response) private void RequestMapItemsCompleted(LLSDMap response)
{ {
UUID requestID = response["requestID"].AsUUID(); UUID requestID = response["requestID"].AsUUID();
@ -460,10 +460,10 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
if (response.ContainsKey(mrs.itemtype.ToString())) if (response.ContainsKey(mrs.itemtype.ToString()))
{ {
List<mapItemReply> returnitems = new List<mapItemReply>(); List<mapItemReply> returnitems = new List<mapItemReply>();
OSDArray itemarray = (OSDArray)response[mrs.itemtype.ToString()]; LLSDArray itemarray = (LLSDArray)response[mrs.itemtype.ToString()];
for (int i = 0; i < itemarray.Count; i++) for (int i = 0; i < itemarray.Count; i++)
{ {
OSDMap mapitem = (OSDMap)itemarray[i]; LLSDMap mapitem = (LLSDMap)itemarray[i];
mapItemReply mi = new mapItemReply(); mapItemReply mi = new mapItemReply();
mi.x = (uint)mapitem["X"].AsInteger(); mi.x = (uint)mapitem["X"].AsInteger();
mi.y = (uint)mapitem["Y"].AsInteger(); mi.y = (uint)mapitem["Y"].AsInteger();
@ -517,7 +517,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
/// <param name="itemtype">passed in from packet</param> /// <param name="itemtype">passed in from packet</param>
/// <param name="regionhandle">Region we're looking up</param> /// <param name="regionhandle">Region we're looking up</param>
/// <returns></returns> /// <returns></returns>
private OSDMap RequestMapItemsAsync(string httpserver, UUID id, uint flags, private LLSDMap RequestMapItemsAsync(string httpserver, UUID id, uint flags,
uint EstateID, bool godlike, uint itemtype, ulong regionhandle) uint EstateID, bool godlike, uint itemtype, ulong regionhandle)
{ {
bool blacklisted = false; bool blacklisted = false;
@ -528,7 +528,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
} }
if (blacklisted) if (blacklisted)
return new OSDMap(); return new LLSDMap();
UUID requestID = UUID.Random(); UUID requestID = UUID.Random();
lock (m_cachedRegionMapItemsAddress) lock (m_cachedRegionMapItemsAddress)
@ -569,7 +569,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
// Can't find the http server // Can't find the http server
if (httpserver.Length == 0 || blacklisted) if (httpserver.Length == 0 || blacklisted)
return new OSDMap(); return new LLSDMap();
MapRequestState mrs = new MapRequestState(); MapRequestState mrs = new MapRequestState();
mrs.agentID = id; mrs.agentID = id;
@ -585,14 +585,14 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
WebRequest mapitemsrequest = WebRequest.Create(httpserver); WebRequest mapitemsrequest = WebRequest.Create(httpserver);
mapitemsrequest.Method = "POST"; mapitemsrequest.Method = "POST";
mapitemsrequest.ContentType = "application/xml+llsd"; mapitemsrequest.ContentType = "application/xml+llsd";
OSDMap RAMap = new OSDMap(); LLSDMap RAMap = new LLSDMap();
// string RAMapString = RAMap.ToString(); // string RAMapString = RAMap.ToString();
OSD LLSDofRAMap = RAMap; // RENAME if this works LLSD LLSDofRAMap = RAMap; // RENAME if this works
byte[] buffer = OSDParser.SerializeLLSDXmlBytes(LLSDofRAMap); byte[] buffer = LLSDParser.SerializeXmlBytes(LLSDofRAMap);
OSDMap responseMap = new OSDMap(); LLSDMap responseMap = new LLSDMap();
responseMap["requestID"] = OSD.FromUUID(requestID); responseMap["requestID"] = LLSD.FromUUID(requestID);
Stream os = null; Stream os = null;
try try
@ -606,7 +606,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
catch (WebException ex) catch (WebException ex)
{ {
m_log.InfoFormat("[WorldMap] Bad send on GetMapItems {0}", ex.Message); m_log.InfoFormat("[WorldMap] Bad send on GetMapItems {0}", ex.Message);
responseMap["connect"] = OSD.FromBoolean(false); responseMap["connect"] = LLSD.FromBoolean(false);
lock (m_blacklistedurls) lock (m_blacklistedurls)
{ {
if (!m_blacklistedurls.ContainsKey(httpserver)) if (!m_blacklistedurls.ContainsKey(httpserver))
@ -630,12 +630,12 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
} }
else else
{ {
return new OSDMap(); return new LLSDMap();
} }
} }
catch (WebException) catch (WebException)
{ {
responseMap["connect"] = OSD.FromBoolean(false); responseMap["connect"] = LLSD.FromBoolean(false);
lock (m_blacklistedurls) lock (m_blacklistedurls)
{ {
if (!m_blacklistedurls.ContainsKey(httpserver)) if (!m_blacklistedurls.ContainsKey(httpserver))
@ -646,18 +646,18 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
return responseMap; return responseMap;
} }
OSD rezResponse = null; LLSD rezResponse = null;
try try
{ {
rezResponse = OSDParser.DeserializeLLSDXml(response_mapItems_reply); rezResponse = LLSDParser.DeserializeXml(response_mapItems_reply);
responseMap = (OSDMap)rezResponse; responseMap = (LLSDMap)rezResponse;
responseMap["requestID"] = OSD.FromUUID(requestID); responseMap["requestID"] = LLSD.FromUUID(requestID);
} }
catch (Exception) catch (Exception)
{ {
//m_log.InfoFormat("[OGP]: exception on parse of rez reply {0}", ex.Message); //m_log.InfoFormat("[OGP]: exception on parse of rez reply {0}", ex.Message);
responseMap["connect"] = OSD.FromBoolean(false); responseMap["connect"] = LLSD.FromBoolean(false);
return responseMap; return responseMap;
} }
@ -793,57 +793,57 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
return null; return null;
} }
public OSD HandleRemoteMapItemRequest(string path, OSD request, string endpoint) public LLSD HandleRemoteMapItemRequest(string path, LLSD request, string endpoint)
{ {
uint xstart = 0; uint xstart = 0;
uint ystart = 0; uint ystart = 0;
Utils.LongToUInts(m_scene.RegionInfo.RegionHandle,out xstart,out ystart); Helpers.LongToUInts(m_scene.RegionInfo.RegionHandle,out xstart,out ystart);
OSDMap responsemap = new OSDMap(); LLSDMap responsemap = new LLSDMap();
List<ScenePresence> avatars = m_scene.GetAvatars(); List<ScenePresence> avatars = m_scene.GetAvatars();
OSDArray responsearr = new OSDArray(avatars.Count); LLSDArray responsearr = new LLSDArray(avatars.Count);
OSDMap responsemapdata = new OSDMap(); LLSDMap responsemapdata = new LLSDMap();
int tc = System.Environment.TickCount; int tc = System.Environment.TickCount;
/* /*
foreach (ScenePresence av in avatars) foreach (ScenePresence av in avatars)
{ {
responsemapdata = new OSDMap(); responsemapdata = new LLSDMap();
responsemapdata["X"] = OSD.FromInteger((int)(xstart + av.AbsolutePosition.X)); responsemapdata["X"] = LLSD.FromInteger((int)(xstart + av.AbsolutePosition.X));
responsemapdata["Y"] = OSD.FromInteger((int)(ystart + av.AbsolutePosition.Y)); responsemapdata["Y"] = LLSD.FromInteger((int)(ystart + av.AbsolutePosition.Y));
responsemapdata["ID"] = OSD.FromUUID(UUID.Zero); responsemapdata["ID"] = LLSD.FromUUID(UUID.Zero);
responsemapdata["Name"] = OSD.FromString("TH"); responsemapdata["Name"] = LLSD.FromString("TH");
responsemapdata["Extra"] = OSD.FromInteger(0); responsemapdata["Extra"] = LLSD.FromInteger(0);
responsemapdata["Extra2"] = OSD.FromInteger(0); responsemapdata["Extra2"] = LLSD.FromInteger(0);
responsearr.Add(responsemapdata); responsearr.Add(responsemapdata);
} }
responsemap["1"] = responsearr; responsemap["1"] = responsearr;
*/ */
if (avatars.Count == 0) if (avatars.Count == 0)
{ {
responsemapdata = new OSDMap(); responsemapdata = new LLSDMap();
responsemapdata["X"] = OSD.FromInteger((int)(xstart + 1)); responsemapdata["X"] = LLSD.FromInteger((int)(xstart + 1));
responsemapdata["Y"] = OSD.FromInteger((int)(ystart + 1)); responsemapdata["Y"] = LLSD.FromInteger((int)(ystart + 1));
responsemapdata["ID"] = OSD.FromUUID(UUID.Zero); responsemapdata["ID"] = LLSD.FromUUID(UUID.Zero);
responsemapdata["Name"] = OSD.FromString(Util.Md5Hash(m_scene.RegionInfo.RegionName + tc.ToString())); responsemapdata["Name"] = LLSD.FromString(Util.Md5Hash(m_scene.RegionInfo.RegionName + tc.ToString()));
responsemapdata["Extra"] = OSD.FromInteger(0); responsemapdata["Extra"] = LLSD.FromInteger(0);
responsemapdata["Extra2"] = OSD.FromInteger(0); responsemapdata["Extra2"] = LLSD.FromInteger(0);
responsearr.Add(responsemapdata); responsearr.Add(responsemapdata);
responsemap["6"] = responsearr; responsemap["6"] = responsearr;
} }
else else
{ {
responsearr = new OSDArray(avatars.Count); responsearr = new LLSDArray(avatars.Count);
foreach (ScenePresence av in avatars) foreach (ScenePresence av in avatars)
{ {
responsemapdata = new OSDMap(); responsemapdata = new LLSDMap();
responsemapdata["X"] = OSD.FromInteger((int)(xstart + av.AbsolutePosition.X)); responsemapdata["X"] = LLSD.FromInteger((int)(xstart + av.AbsolutePosition.X));
responsemapdata["Y"] = OSD.FromInteger((int)(ystart + av.AbsolutePosition.Y)); responsemapdata["Y"] = LLSD.FromInteger((int)(ystart + av.AbsolutePosition.Y));
responsemapdata["ID"] = OSD.FromUUID(UUID.Zero); responsemapdata["ID"] = LLSD.FromUUID(UUID.Zero);
responsemapdata["Name"] = OSD.FromString(Util.Md5Hash(m_scene.RegionInfo.RegionName + tc.ToString())); responsemapdata["Name"] = LLSD.FromString(Util.Md5Hash(m_scene.RegionInfo.RegionName + tc.ToString()));
responsemapdata["Extra"] = OSD.FromInteger(1); responsemapdata["Extra"] = LLSD.FromInteger(1);
responsemapdata["Extra2"] = OSD.FromInteger(0); responsemapdata["Extra2"] = LLSD.FromInteger(0);
responsearr.Add(responsemapdata); responsearr.Add(responsemapdata);
} }
responsemap["6"] = responsearr; responsemap["6"] = responsearr;

1
OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
View File

@ -31,6 +31,7 @@ using System.Reflection;
using System.Text; using System.Text;
using System.Timers; using System.Timers;
using OpenMetaverse; using OpenMetaverse;
using OpenMetaverse.Packets;
using log4net; using log4net;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;

8
OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
View File

@ -36,7 +36,7 @@ using log4net;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Communications; using OpenSim.Framework.Communications;
using OpenSim.Region.Interfaces; using OpenSim.Region.Interfaces;
using OSD = OpenMetaverse.StructuredData.OSD; using LLSD = OpenMetaverse.StructuredData.LLSD;
namespace OpenSim.Region.Environment.Scenes namespace OpenSim.Region.Environment.Scenes
{ {
@ -284,7 +284,7 @@ namespace OpenSim.Region.Environment.Scenes
IEventQueue eq = avatar.Scene.RequestModuleInterface<IEventQueue>(); IEventQueue eq = avatar.Scene.RequestModuleInterface<IEventQueue>();
if (eq != null) if (eq != null)
{ {
OSD Item = EventQueueHelper.EnableSimulator(regionHandle, endPoint); LLSD Item = EventQueueHelper.EnableSimulator(regionHandle, endPoint);
eq.Enqueue(Item, avatar.UUID); eq.Enqueue(Item, avatar.UUID);
} }
else else
@ -698,7 +698,7 @@ namespace OpenSim.Region.Environment.Scenes
if (eq != null) if (eq != null)
{ {
OSD Item = EventQueueHelper.TeleportFinishEvent(reg.RegionHandle, 13, reg.ExternalEndPoint, LLSD Item = EventQueueHelper.TeleportFinishEvent(reg.RegionHandle, 13, reg.ExternalEndPoint,
4, teleportFlags, capsPath, avatar.UUID); 4, teleportFlags, capsPath, avatar.UUID);
eq.Enqueue(Item, avatar.UUID); eq.Enqueue(Item, avatar.UUID);
} }
@ -748,7 +748,7 @@ namespace OpenSim.Region.Environment.Scenes
// and set the map-tile to '(Offline)' // and set the map-tile to '(Offline)'
uint regX, regY; uint regX, regY;
Utils.LongToUInts(regionHandle, out regX, out regY); Helpers.LongToUInts(regionHandle, out regX, out regY);
MapBlockData block = new MapBlockData(); MapBlockData block = new MapBlockData();
block.X = (ushort)(regX / Constants.RegionSize); block.X = (ushort)(regX / Constants.RegionSize);

12
OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
View File

@ -584,11 +584,11 @@ namespace OpenSim.Region.Environment.Scenes
invString.AddPermissionsStart(); invString.AddPermissionsStart();
invString.AddNameValueLine("base_mask", Utils.UIntToHexString(baseMask)); invString.AddNameValueLine("base_mask", Helpers.UIntToHexString(baseMask));
invString.AddNameValueLine("owner_mask", Utils.UIntToHexString(ownerMask)); invString.AddNameValueLine("owner_mask", Helpers.UIntToHexString(ownerMask));
invString.AddNameValueLine("group_mask", Utils.UIntToHexString(0)); invString.AddNameValueLine("group_mask", Helpers.UIntToHexString(0));
invString.AddNameValueLine("everyone_mask", Utils.UIntToHexString(everyoneMask)); invString.AddNameValueLine("everyone_mask", Helpers.UIntToHexString(everyoneMask));
invString.AddNameValueLine("next_owner_mask", Utils.UIntToHexString(item.NextPermissions)); invString.AddNameValueLine("next_owner_mask", Helpers.UIntToHexString(item.NextPermissions));
invString.AddNameValueLine("creator_id", item.CreatorID.ToString()); invString.AddNameValueLine("creator_id", item.CreatorID.ToString());
invString.AddNameValueLine("owner_id", ownerID.ToString()); invString.AddNameValueLine("owner_id", ownerID.ToString());
@ -601,7 +601,7 @@ namespace OpenSim.Region.Environment.Scenes
invString.AddNameValueLine("asset_id", item.AssetID.ToString()); invString.AddNameValueLine("asset_id", item.AssetID.ToString());
invString.AddNameValueLine("type", TaskInventoryItem.Types[item.Type]); invString.AddNameValueLine("type", TaskInventoryItem.Types[item.Type]);
invString.AddNameValueLine("inv_type", TaskInventoryItem.InvTypes[item.InvType]); invString.AddNameValueLine("inv_type", TaskInventoryItem.InvTypes[item.InvType]);
invString.AddNameValueLine("flags", Utils.UIntToHexString(item.Flags)); invString.AddNameValueLine("flags", Helpers.UIntToHexString(item.Flags));
invString.AddSaleStart(); invString.AddSaleStart();
invString.AddNameValueLine("sale_type", "not"); invString.AddNameValueLine("sale_type", "not");

6
OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
View File

@ -1089,9 +1089,9 @@ if (m_shape != null) {
data[pos] = (byte)pTexAnim.SizeX; pos++; data[pos] = (byte)pTexAnim.SizeX; pos++;
data[pos] = (byte)pTexAnim.SizeY; pos++; data[pos] = (byte)pTexAnim.SizeY; pos++;
Utils.FloatToBytes(pTexAnim.Start).CopyTo(data, pos); Helpers.FloatToBytes(pTexAnim.Start).CopyTo(data, pos);
Utils.FloatToBytes(pTexAnim.Length).CopyTo(data, pos + 4); Helpers.FloatToBytes(pTexAnim.Length).CopyTo(data, pos + 4);
Utils.FloatToBytes(pTexAnim.Rate).CopyTo(data, pos + 8); Helpers.FloatToBytes(pTexAnim.Rate).CopyTo(data, pos + 8);
m_TextureAnimation = data; m_TextureAnimation = data;
} }

6
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@ -39,7 +39,7 @@ using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.Environment.Types; using OpenSim.Region.Environment.Types;
using OpenSim.Region.Interfaces; using OpenSim.Region.Interfaces;
using OpenSim.Region.Physics.Manager; using OpenSim.Region.Physics.Manager;
using OSD = OpenMetaverse.StructuredData.OSD; using LLSD = OpenMetaverse.StructuredData.LLSD;
namespace OpenSim.Region.Environment.Scenes namespace OpenSim.Region.Environment.Scenes
@ -2171,7 +2171,7 @@ namespace OpenSim.Region.Environment.Scenes
} }
Vector3 vel = m_velocity; Vector3 vel = m_velocity;
ulong neighbourHandle = Utils.UIntsToLong((uint)(neighbourx * Constants.RegionSize), (uint)(neighboury * Constants.RegionSize)); ulong neighbourHandle = Helpers.UIntsToLong((uint)(neighbourx * Constants.RegionSize), (uint)(neighboury * Constants.RegionSize));
SimpleRegionInfo neighbourRegion = m_scene.RequestNeighbouringRegionInfo(neighbourHandle); SimpleRegionInfo neighbourRegion = m_scene.RequestNeighbouringRegionInfo(neighbourHandle);
if (neighbourRegion != null && ValidateAttachments()) if (neighbourRegion != null && ValidateAttachments())
{ {
@ -2209,7 +2209,7 @@ namespace OpenSim.Region.Environment.Scenes
if (eq != null) if (eq != null)
{ {
OSD Item = EventQueueHelper.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint, LLSD Item = EventQueueHelper.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint,
capsPath, UUID, ControllingClient.SessionId); capsPath, UUID, ControllingClient.SessionId);
eq.Enqueue(Item, UUID); eq.Enqueue(Item, UUID);
} }

2
OpenSim/Region/Interfaces/IEventQueue.cs
View File

@ -36,6 +36,6 @@ namespace OpenSim.Region.Interfaces
{ {
public interface IEventQueue public interface IEventQueue
{ {
bool Enqueue(OSD o, UUID avatarID); bool Enqueue(LLSD o, UUID avatarID);
} }
} }

5
OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs
View File

@ -29,9 +29,6 @@ using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Reflection; using System.Reflection;
using System.Security;
using System.Security.Policy;
using System.Security.Permissions;
using OpenSim.Region.ScriptEngine.Interfaces; using OpenSim.Region.ScriptEngine.Interfaces;
using OpenSim.Region.ScriptEngine.Shared.ScriptBase; using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
@ -135,9 +132,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
ads.ConfigurationFile = ads.ConfigurationFile =
AppDomain.CurrentDomain.SetupInformation.ConfigurationFile; AppDomain.CurrentDomain.SetupInformation.ConfigurationFile;
AppDomain AD = AppDomain.CreateDomain("ScriptAppDomain_" + AppDomain AD = AppDomain.CreateDomain("ScriptAppDomain_" +
AppDomainNameCount, null, ads); AppDomainNameCount, null, ads);
m_scriptEngine.Log.Info("[" + m_scriptEngine.ScriptEngineName + m_scriptEngine.Log.Info("[" + m_scriptEngine.ScriptEngineName +
"]: AppDomain Loading: " + "]: AppDomain Loading: " +
AssemblyName.GetAssemblyName( AssemblyName.GetAssemblyName(

3
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
View File

@ -30,7 +30,6 @@ using System.IO;
using System.Threading; using System.Threading;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Security;
using System.Security.Policy; using System.Security.Policy;
using System.Reflection; using System.Reflection;
using System.Globalization; using System.Globalization;
@ -541,7 +540,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
AppDomain.CreateDomain( AppDomain.CreateDomain(
m_Scene.RegionInfo.RegionID.ToString(), m_Scene.RegionInfo.RegionID.ToString(),
evidence, appSetup); evidence, appSetup);
m_AppDomains[appDomain].AssemblyResolve += m_AppDomains[appDomain].AssemblyResolve +=
new ResolveEventHandler( new ResolveEventHandler(
AssemblyResolver.OnAssemblyResolve); AssemblyResolver.OnAssemblyResolve);

4
OpenSim/TestSuite/PhysicsBot.cs
View File

@ -96,7 +96,7 @@ namespace OpenSim.TestSuite
client.Self.Movement.AtPos = true; client.Self.Movement.AtPos = true;
Thread.Sleep(somthing.Next(25, 75)); // Makes sure the bots keep walking for this time. Thread.Sleep(somthing.Next(25, 75)); // Makes sure the bots keep walking for this time.
} }
client.Self.Jump(true); client.Self.Jump();
string randomf = talkarray[somthing.Next(talkarray.Length)]; string randomf = talkarray[somthing.Next(talkarray.Length)];
if (talkarray.Length > 1 && randomf.Length > 1) if (talkarray.Length > 1 && randomf.Length > 1)
@ -142,7 +142,7 @@ namespace OpenSim.TestSuite
m_action.Elapsed += new ElapsedEventHandler(m_action_Elapsed); m_action.Elapsed += new ElapsedEventHandler(m_action_Elapsed);
m_action.Start(); m_action.Start();
OnConnected(this, EventType.CONNECTED); OnConnected(this, EventType.CONNECTED);
client.Self.Jump(true); client.Self.Jump();
} }
} }
else else

4
OpenSim/Tools/pCampBot/PhysicsBot.cs
View File

@ -96,7 +96,7 @@ namespace pCampBot
client.Self.Movement.AtPos = true; client.Self.Movement.AtPos = true;
Thread.Sleep(somthing.Next(25, 75)); // Makes sure the bots keep walking for this time. Thread.Sleep(somthing.Next(25, 75)); // Makes sure the bots keep walking for this time.
} }
client.Self.Jump(true); client.Self.Jump();
string randomf = talkarray[somthing.Next(talkarray.Length)]; string randomf = talkarray[somthing.Next(talkarray.Length)];
if (talkarray.Length > 1 && randomf.Length > 1) if (talkarray.Length > 1 && randomf.Length > 1)
@ -141,7 +141,7 @@ namespace pCampBot
m_action.Elapsed += new ElapsedEventHandler(m_action_Elapsed); m_action.Elapsed += new ElapsedEventHandler(m_action_Elapsed);
m_action.Start(); m_action.Start();
OnConnected(this, EventType.CONNECTED); OnConnected(this, EventType.CONNECTED);
client.Self.Jump(true); client.Self.Jump();
} }
} }
else else

BIN
bin/OpenMetaverse.StructuredData.dll
View File

Binary file not shown.

BIN
bin/OpenMetaverse.dll
View File

Binary file not shown.

6
bin/OpenMetaverse.dll.config
View File

@ -1,5 +1,5 @@
<configuration> <configuration>
<dllmap os="osx" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib" /> <dllmap os="osx" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0.dylib" />
<dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64" /> <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-x86_64" />
<dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1" /> <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0" />
</configuration> </configuration>

BIN
bin/OpenMetaverseTypes.dll
View File

Binary file not shown.

BIN
bin/libopenjpeg-1.0.0-x86_64.so Normal file
View File

Binary file not shown.

BIN
bin/libopenjpeg-1.0.0.so Normal file
View File

Binary file not shown.

BIN
bin/libopenjpeg-1.1.0.dylib Normal file
View File

Binary file not shown.

BIN
bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64.so
View File

Binary file not shown.

BIN
bin/libopenjpeg-dotnet-2.1.3.0-x86_64.so Normal file
View File

Binary file not shown.

BIN
bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib → bin/libopenjpeg-dotnet-2.1.3.0.dylib
View File

Binary file not shown.

0
bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1.so → bin/libopenjpeg-dotnet-2.1.3.0.so
View File

BIN
bin/libopenjpeg-libsl-2.1.2.0.dylib Normal file
View File

Binary file not shown.

BIN
bin/libopenjpeg-libsl-2.1.2.0.so Normal file
View File

Binary file not shown.

BIN
bin/libsecondlife.dll Normal file
View File

Binary file not shown.

0
bin/libsecondlife.dll.config Normal file
View File

BIN
bin/openjpeg-dotnet.dll
View File

Binary file not shown.

BIN
bin/openjpeg-libsl.dll Normal file
View File

Binary file not shown.

14
prebuild.xml
View File

@ -461,7 +461,7 @@
<Reference name="OpenSim.Framework"/> <Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Framework.Console"/> <Reference name="OpenSim.Framework.Console"/>
<Reference name="OpenSim.Framework.Statistics"/> <Reference name="OpenSim.Framework.Statistics"/>
<Reference name="OpenMetaverse.StructuredData.dll"/> <Reference name="OpenMetaverse.dll"/>
<Reference name="OpenMetaverseTypes.dll"/> <Reference name="OpenMetaverseTypes.dll"/>
<Reference name="XMLRPC.dll"/> <Reference name="XMLRPC.dll"/>
<Reference name="log4net.dll"/> <Reference name="log4net.dll"/>
@ -706,7 +706,7 @@
<Reference name="System" localCopy="false"/> <Reference name="System" localCopy="false"/>
<Reference name="System.Runtime.Remoting"/> <Reference name="System.Runtime.Remoting"/>
<Reference name="OpenSim.Framework"/> <Reference name="OpenSim.Framework"/>
<Reference name="OpenMetaverse.StructuredData.dll"/> <Reference name="OpenMetaverse.dll"/>
<Reference name="OpenMetaverseTypes.dll"/> <Reference name="OpenMetaverseTypes.dll"/>
<Files> <Files>
@ -739,8 +739,6 @@
<Reference name="OpenSim.Framework.Statistics"/> <Reference name="OpenSim.Framework.Statistics"/>
<Reference name="OpenSim.Region.Interfaces"/> <Reference name="OpenSim.Region.Interfaces"/>
<Reference name="OpenMetaverseTypes.dll"/> <Reference name="OpenMetaverseTypes.dll"/>
<Reference name="OpenMetaverse.StructuredData.dll"/>
<!-- FIXME: The OpenMetaverse.dll reference can be dropped when the TransferRequestPacket reference is removed from the code -->
<Reference name="OpenMetaverse.dll"/> <Reference name="OpenMetaverse.dll"/>
<Reference name="Nini.dll" /> <Reference name="Nini.dll" />
<Reference name="XMLRPC.dll"/> <Reference name="XMLRPC.dll"/>
@ -834,7 +832,6 @@
<Reference name="System.Runtime.Remoting"/> <Reference name="System.Runtime.Remoting"/>
<Reference name="System.Web"/> <Reference name="System.Web"/>
<Reference name="OpenMetaverseTypes.dll"/> <Reference name="OpenMetaverseTypes.dll"/>
<Reference name="OpenMetaverse.StructuredData.dll"/>
<Reference name="OpenMetaverse.dll"/> <Reference name="OpenMetaverse.dll"/>
<Reference name="OpenSim.Framework"/> <Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Data" /> <Reference name="OpenSim.Data" />
@ -1140,7 +1137,6 @@
<Reference name="System.Xml"/> <Reference name="System.Xml"/>
<Reference name="Mono.Addins.dll" /> <Reference name="Mono.Addins.dll" />
<Reference name="OpenMetaverseTypes.dll"/> <Reference name="OpenMetaverseTypes.dll"/>
<Reference name="OpenMetaverse.StructuredData.dll"/>
<Reference name="OpenMetaverse.dll"/> <Reference name="OpenMetaverse.dll"/>
<Reference name="OpenSim.Framework"/> <Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Data"/> <Reference name="OpenSim.Data"/>
@ -1946,7 +1942,7 @@
<Reference name="System.Web" localCopy="false"/> <Reference name="System.Web" localCopy="false"/>
<Reference name="System.Xml" localCopy="false"/> <Reference name="System.Xml" localCopy="false"/>
<Reference name="OpenMetaverseTypes.dll"/> <Reference name="OpenMetaverseTypes.dll"/>
<Reference name="OpenMetaverse.StructuredData.dll"/> <Reference name="OpenMetaverse.dll"/>
<Reference name="OpenSim" /> <Reference name="OpenSim" />
<Reference name="OpenSim.Framework"/> <Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Framework.Communications"/> <Reference name="OpenSim.Framework.Communications"/>
@ -1987,7 +1983,7 @@
<Reference name="System.Xml" localCopy="false"/> <Reference name="System.Xml" localCopy="false"/>
<Reference name="System.Runtime.Remoting" localCopy="false"/> <Reference name="System.Runtime.Remoting" localCopy="false"/>
<Reference name="OpenMetaverseTypes.dll"/> <Reference name="OpenMetaverseTypes.dll"/>
<Reference name="OpenMetaverse.StructuredData.dll"/> <Reference name="OpenMetaverse.dll"/>
<Reference name="RAIL.dll"/> <Reference name="RAIL.dll"/>
<Reference name="OpenSim.Framework"/> <Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Framework.Console"/> <Reference name="OpenSim.Framework.Console"/>
@ -2121,7 +2117,7 @@
<Reference name="OpenSim.Framework.Statistics"/> <Reference name="OpenSim.Framework.Statistics"/>
<Reference name="OpenSim.Grid.Communications.OGS1"/> <Reference name="OpenSim.Grid.Communications.OGS1"/>
<Reference name="OpenMetaverseTypes.dll"/> <Reference name="OpenMetaverseTypes.dll"/>
<Reference name="OpenMetaverse.StructuredData.dll"/> <Reference name="OpenMetaverse.dll"/>
<Reference name="XMLRPC.dll"/> <Reference name="XMLRPC.dll"/>
<Reference name="log4net.dll"/> <Reference name="log4net.dll"/>