From 7d4846462bf5f3c7fe862c7466d0461b6c5d228f Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Fri, 20 Feb 2009 02:33:54 +0000
Subject: Update svn properties, add copyright headers, minor formatting
cleanup.
---
OpenSim/Region/Application/OpenSimBase.cs | 2 +-
.../Scripting/VectorRender/VectorRenderModule.cs | 92 +-
.../Framework/Scenes/ChildAgentDataUpdate.cs | 1012 ++++++++++----------
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 1 -
.../Avatar/Concierge/ConciergeModule.cs | 6 +-
5 files changed, 553 insertions(+), 560 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 69ff2bd..54822d0 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -437,7 +437,7 @@ namespace OpenSim
private IAssetServer loadAssetServer(string id, PluginInitialiserBase pi)
{
- if(id != null && id != String.Empty)
+ if (id != null && id != String.Empty)
{
m_log.DebugFormat("[OPENSIMBASE] Attempting to load asset server id={0}", id);
diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
index 86f836c..7cee0cf 100644
--- a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
@@ -147,7 +147,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
int width = 256;
int height = 256;
int alpha = 255; // 0 is transparent
- Color bgColour = Color.White; // Default background color
+ Color bgColour = Color.White; // Default background color
char[] paramDelimiter = { ',' };
char[] nvpDelimiter = { ':' };
@@ -230,18 +230,17 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
}
}
break;
- case "bgcolour":
- int hex = 0;
- if (Int32.TryParse(value, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out hex))
- {
- bgColour = Color.FromArgb(hex);
- }
- else
- {
-
- bgColour = Color.FromName(value);
- }
- break;
+ case "bgcolour":
+ int hex = 0;
+ if (Int32.TryParse(value, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out hex))
+ {
+ bgColour = Color.FromArgb(hex);
+ }
+ else
+ {
+ bgColour = Color.FromName(value);
+ }
+ break;
case "":
// blank string has been passed do nothing just use defaults
break;
@@ -271,7 +270,6 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
}
break;
}
-
}
Bitmap bitmap = new Bitmap(width, height, PixelFormat.Format32bppArgb);
@@ -282,8 +280,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
// background color in their scripts, only do when fully opaque
if (alpha == 255)
{
- graph.FillRectangle(new SolidBrush(bgColour), 0, 0, width, height);
-
+ graph.FillRectangle(new SolidBrush(bgColour), 0, 0, width, height);
}
for (int w = 0; w < bitmap.Width; w++)
@@ -294,7 +291,6 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
}
}
-
GDIDraw(data, graph);
byte[] imageJ2000 = new byte[0];
@@ -326,10 +322,8 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
}
return parsed;
-
}
-
/*
private void CairoDraw(string data, System.Drawing.Graphics graph)
{
@@ -462,38 +456,38 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
fontSize = Convert.ToSingle(nextLine, CultureInfo.InvariantCulture);
myFont = new Font(fontName, fontSize);
}
- else if (nextLine.StartsWith("FontProp"))
- {
- nextLine = nextLine.Remove(0, 8);
+ else if (nextLine.StartsWith("FontProp"))
+ {
+ nextLine = nextLine.Remove(0, 8);
nextLine = nextLine.Trim();
- string [] fprops = nextLine.Split(partsDelimiter);
- foreach (string prop in fprops) {
-
- switch (prop)
- {
- case "B":
- if(!(myFont.Bold))
- myFont = new Font(myFont, myFont.Style | FontStyle.Bold);
- break;
- case "I":
- if(!(myFont.Italic))
- myFont = new Font(myFont, myFont.Style | FontStyle.Italic);
- break;
- case "U":
- if(!(myFont.Underline))
- myFont = new Font(myFont, myFont.Style | FontStyle.Underline);
- break;
- case "S":
- if(!(myFont.Strikeout))
- myFont = new Font(myFont, myFont.Style | FontStyle.Strikeout);
- break;
- case "R":
- myFont = new Font(myFont, FontStyle.Regular);
- break;
- }
- }
- }
+ string [] fprops = nextLine.Split(partsDelimiter);
+ foreach (string prop in fprops) {
+
+ switch (prop)
+ {
+ case "B":
+ if (!(myFont.Bold))
+ myFont = new Font(myFont, myFont.Style | FontStyle.Bold);
+ break;
+ case "I":
+ if (!(myFont.Italic))
+ myFont = new Font(myFont, myFont.Style | FontStyle.Italic);
+ break;
+ case "U":
+ if (!(myFont.Underline))
+ myFont = new Font(myFont, myFont.Style | FontStyle.Underline);
+ break;
+ case "S":
+ if (!(myFont.Strikeout))
+ myFont = new Font(myFont, myFont.Style | FontStyle.Strikeout);
+ break;
+ case "R":
+ myFont = new Font(myFont, FontStyle.Regular);
+ break;
+ }
+ }
+ }
else if (nextLine.StartsWith("FontName"))
{
nextLine = nextLine.Remove(0, 8);
diff --git a/OpenSim/Region/Framework/Scenes/ChildAgentDataUpdate.cs b/OpenSim/Region/Framework/Scenes/ChildAgentDataUpdate.cs
index e181b91..6bfa73b 100644
--- a/OpenSim/Region/Framework/Scenes/ChildAgentDataUpdate.cs
+++ b/OpenSim/Region/Framework/Scenes/ChildAgentDataUpdate.cs
@@ -1,506 +1,506 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the OpenSim Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using OpenSim.Framework;
-using OpenMetaverse;
-using OpenMetaverse.StructuredData;
-
-namespace OpenSim.Region.Framework.Scenes
-{
- public interface IAgentData
- {
- UUID AgentID { get; set; }
-
- OSDMap PackUpdateMessage();
- void UnpackUpdateMessage(OSDMap map);
- }
-
- ///
- /// Replacement for ChildAgentDataUpdate. Used over RESTComms and LocalComms.
- ///
- public class AgentPosition : IAgentData
- {
- private UUID m_id;
- public UUID AgentID
- {
- get { return m_id; }
- set { m_id = value; }
- }
-
- public ulong RegionHandle;
- public uint CircuitCode;
- public UUID SessionID;
-
- public float Far;
- public Vector3 Position;
- public Vector3 Velocity;
- public Vector3 Center;
- public Vector3 Size;
- public Vector3 AtAxis;
- public Vector3 LeftAxis;
- public Vector3 UpAxis;
- public bool ChangedGrid;
-
- // This probably shouldn't be here
- public byte[] Throttles;
-
-
- public OSDMap PackUpdateMessage()
- {
- OSDMap args = new OSDMap();
- args["message_type"] = OSD.FromString("AgentPosition");
-
- args["region_handle"] = OSD.FromString(RegionHandle.ToString());
- args["circuit_code"] = OSD.FromString(CircuitCode.ToString());
- args["agent_uuid"] = OSD.FromUUID(AgentID);
- args["session_uuid"] = OSD.FromUUID(SessionID);
-
- args["position"] = OSD.FromString(Position.ToString());
- args["velocity"] = OSD.FromString(Velocity.ToString());
- args["center"] = OSD.FromString(Center.ToString());
- args["size"] = OSD.FromString(Size.ToString());
- args["at_axis"] = OSD.FromString(AtAxis.ToString());
- args["left_axis"] = OSD.FromString(LeftAxis.ToString());
- args["up_axis"] = OSD.FromString(UpAxis.ToString());
-
- args["far"] = OSD.FromReal(Far);
- args["changed_grid"] = OSD.FromBoolean(ChangedGrid);
-
- if ((Throttles != null) && (Throttles.Length > 0))
- args["throttles"] = OSD.FromBinary(Throttles);
-
- return args;
- }
-
- public void UnpackUpdateMessage(OSDMap args)
- {
- if (args.ContainsKey("region_handle"))
- UInt64.TryParse(args["region_handle"].AsString(), out RegionHandle);
-
- if (args["circuit_code"] != null)
- UInt32.TryParse((string)args["circuit_code"].AsString(), out CircuitCode);
-
- if (args["agent_uuid"] != null)
- AgentID = args["agent_uuid"].AsUUID();
-
- if (args["session_uuid"] != null)
- SessionID = args["session_uuid"].AsUUID();
-
- if (args["position"] != null)
- Vector3.TryParse(args["position"].AsString(), out Position);
-
- if (args["velocity"] != null)
- Vector3.TryParse(args["velocity"].AsString(), out Velocity);
-
- if (args["center"] != null)
- Vector3.TryParse(args["center"].AsString(), out Center);
-
- if (args["size"] != null)
- Vector3.TryParse(args["size"].AsString(), out Size);
-
- if (args["at_axis"] != null)
- Vector3.TryParse(args["at_axis"].AsString(), out AtAxis);
-
- if (args["left_axis"] != null)
- Vector3.TryParse(args["left_axis"].AsString(), out AtAxis);
-
- if (args["up_axis"] != null)
- Vector3.TryParse(args["up_axis"].AsString(), out AtAxis);
-
- if (args["changed_grid"] != null)
- ChangedGrid = args["changed_grid"].AsBoolean();
-
- if (args["far"] != null)
- Far = (float)(args["far"].AsReal());
-
- if (args["throttles"] != null)
- Throttles = args["throttles"].AsBinary();
- }
-
- ///
- /// Soon to be decommissioned
- ///
- ///
- public void CopyFrom(ChildAgentDataUpdate cAgent)
- {
- AgentID = new UUID(cAgent.AgentID);
-
- // next: ???
- Size = new Vector3();
- Size.Z = cAgent.AVHeight;
-
- Center = new Vector3(cAgent.cameraPosition.x, cAgent.cameraPosition.y, cAgent.cameraPosition.z);
- Far = cAgent.drawdistance;
- Position = new Vector3(cAgent.Position.x, cAgent.Position.y, cAgent.Position.z);
- RegionHandle = cAgent.regionHandle;
- Throttles = cAgent.throttles;
- Velocity = new Vector3(cAgent.Velocity.x, cAgent.Velocity.y, cAgent.Velocity.z);
- }
-
- }
-
- public class AgentGroupData
- {
- public UUID GroupID;
- public ulong GroupPowers;
- public bool AcceptNotices;
-
- public AgentGroupData(UUID id, ulong powers, bool notices)
- {
- GroupID = id;
- GroupPowers = powers;
- AcceptNotices = notices;
- }
-
- public AgentGroupData(OSDMap args)
- {
- UnpackUpdateMessage(args);
- }
-
- public OSDMap PackUpdateMessage()
- {
- OSDMap groupdata = new OSDMap();
- groupdata["group_id"] = OSD.FromUUID(GroupID);
- groupdata["group_powers"] = OSD.FromString(GroupPowers.ToString());
- groupdata["accept_notices"] = OSD.FromBoolean(AcceptNotices);
-
- return groupdata;
- }
-
- public void UnpackUpdateMessage(OSDMap args)
- {
- if (args["group_id"] != null)
- GroupID = args["group_id"].AsUUID();
- if (args["group_powers"] != null)
- UInt64.TryParse((string)args["group_powers"].AsString(), out GroupPowers);
- if (args["accept_notices"] != null)
- AcceptNotices = args["accept_notices"].AsBoolean();
- }
- }
-
- //public class AgentAnimationData
- //{
- // public UUID Animation;
- // public UUID ObjectID;
-
- // public AgentAnimationData(UUID anim, UUID obj)
- // {
- // Animation = anim;
- // ObjectID = obj;
- // }
-
- // public AgentAnimationData(OSDMap args)
- // {
- // UnpackUpdateMessage(args);
- // }
-
- // public OSDMap PackUpdateMessage()
- // {
- // OSDMap anim = new OSDMap();
- // anim["animation"] = OSD.FromUUID(Animation);
- // anim["object_id"] = OSD.FromUUID(ObjectID);
- // return anim;
- // }
-
- // public void UnpackUpdateMessage(OSDMap args)
- // {
- // if (args["animation"] != null)
- // Animation = args["animation"].AsUUID();
- // if (args["object_id"] != null)
- // ObjectID = args["object_id"].AsUUID();
- // }
- //}
-
- public class AgentData : IAgentData
- {
- private UUID m_id;
- public UUID AgentID
- {
- get { return m_id; }
- set { m_id = value; }
- }
- public ulong RegionHandle;
- public uint CircuitCode;
- public UUID SessionID;
-
- public Vector3 Position;
- public Vector3 Velocity;
- public Vector3 Center;
- public Vector3 Size;
- public Vector3 AtAxis;
- public Vector3 LeftAxis;
- public Vector3 UpAxis;
- public bool ChangedGrid;
-
- public float Far;
- public float Aspect;
- //public int[] Throttles;
- public byte[] Throttles;
-
- public uint LocomotionState;
- public Quaternion HeadRotation;
- public Quaternion BodyRotation;
- public uint ControlFlags;
- public float EnergyLevel;
- public Byte GodLevel;
- public bool AlwaysRun;
- public UUID PreyAgent;
- public Byte AgentAccess;
- public UUID[] AgentTextures;
- public UUID ActiveGroupID;
-
- public AgentGroupData[] Groups;
- public Animation[] Anims;
-
- public UUID GranterID;
- public Dictionary NVPairs;
-
- public byte[] VisualParams;
-
- public string CallbackURI;
-
- public OSDMap PackUpdateMessage()
- {
- OSDMap args = new OSDMap();
- args["message_type"] = OSD.FromString("AgentData");
-
- args["region_handle"] = OSD.FromString(RegionHandle.ToString());
- args["circuit_code"] = OSD.FromString(CircuitCode.ToString());
- args["agent_uuid"] = OSD.FromUUID(AgentID);
- args["session_uuid"] = OSD.FromUUID(SessionID);
-
- args["position"] = OSD.FromString(Position.ToString());
- args["velocity"] = OSD.FromString(Velocity.ToString());
- args["center"] = OSD.FromString(Center.ToString());
- args["size"] = OSD.FromString(Size.ToString());
- args["at_axis"] = OSD.FromString(AtAxis.ToString());
- args["left_axis"] = OSD.FromString(LeftAxis.ToString());
- args["up_axis"] = OSD.FromString(UpAxis.ToString());
-
- args["changed_grid"] = OSD.FromBoolean(ChangedGrid);
- args["far"] = OSD.FromReal(Far);
- args["aspect"] = OSD.FromReal(Aspect);
-
- if ((Throttles != null) && (Throttles.Length > 0))
- args["throttles"] = OSD.FromBinary(Throttles);
-
- args["locomotion_state"] = OSD.FromString(LocomotionState.ToString());
- args["head_rotation"] = OSD.FromString(HeadRotation.ToString());
- args["body_rotation"] = OSD.FromString(BodyRotation.ToString());
- args["control_flags"] = OSD.FromString(ControlFlags.ToString());
-
- args["energy_level"] = OSD.FromReal(EnergyLevel);
- args["god_level"] = OSD.FromString(GodLevel.ToString());
- args["always_run"] = OSD.FromBoolean(AlwaysRun);
- args["prey_agent"] = OSD.FromUUID(PreyAgent);
- args["agent_access"] = OSD.FromString(AgentAccess.ToString());
-
- if ((AgentTextures != null) && (AgentTextures.Length > 0))
- {
- OSDArray textures = new OSDArray(AgentTextures.Length);
- foreach (UUID uuid in AgentTextures)
- textures.Add(OSD.FromUUID(uuid));
- args["agent_textures"] = textures;
- }
-
- args["active_group_id"] = OSD.FromUUID(ActiveGroupID);
-
- if ((Groups != null) && (Groups.Length > 0))
- {
- OSDArray groups = new OSDArray(Groups.Length);
- foreach (AgentGroupData agd in Groups)
- groups.Add(agd.PackUpdateMessage());
- args["groups"] = groups;
- }
-
- if ((Anims != null) && (Anims.Length > 0))
- {
- OSDArray anims = new OSDArray(Anims.Length);
- foreach (Animation aanim in Anims)
- anims.Add(aanim.PackUpdateMessage());
- args["animations"] = anims;
- }
-
- if ((VisualParams != null) && (VisualParams.Length > 0))
- args["visual_params"] = OSD.FromBinary(VisualParams);
-
- // Last few fields are still missing: granter and NVPais
-
- if ((CallbackURI != null) && (!CallbackURI.Equals("")))
- args["callback_uri"] = OSD.FromString(CallbackURI);
-
- return args;
- }
-
- ///
- /// Deserialization of agent data.
- /// Avoiding reflection makes it painful to write, but that's the price!
- ///
- ///
- public void UnpackUpdateMessage(OSDMap args)
- {
- if (args.ContainsKey("region_handle"))
- UInt64.TryParse(args["region_handle"].AsString(), out RegionHandle);
-
- if (args["circuit_code"] != null)
- UInt32.TryParse((string)args["circuit_code"].AsString(), out CircuitCode);
-
- if (args["agent_uuid"] != null)
- AgentID = args["agent_uuid"].AsUUID();
-
- if (args["session_uuid"] != null)
- SessionID = args["session_uuid"].AsUUID();
-
- if (args["position"] != null)
- Vector3.TryParse(args["position"].AsString(), out Position);
-
- if (args["velocity"] != null)
- Vector3.TryParse(args["velocity"].AsString(), out Velocity);
-
- if (args["center"] != null)
- Vector3.TryParse(args["center"].AsString(), out Center);
-
- if (args["size"] != null)
- Vector3.TryParse(args["size"].AsString(), out Size);
-
- if (args["at_axis"] != null)
- Vector3.TryParse(args["at_axis"].AsString(), out AtAxis);
-
- if (args["left_axis"] != null)
- Vector3.TryParse(args["left_axis"].AsString(), out AtAxis);
-
- if (args["up_axis"] != null)
- Vector3.TryParse(args["up_axis"].AsString(), out AtAxis);
-
- if (args["changed_grid"] != null)
- ChangedGrid = args["changed_grid"].AsBoolean();
-
- if (args["far"] != null)
- Far = (float)(args["far"].AsReal());
-
- if (args["aspect"] != null)
- Aspect = (float)args["aspect"].AsReal();
-
- if (args["throttles"] != null)
- Throttles = args["throttles"].AsBinary();
-
- if (args["locomotion_state"] != null)
- UInt32.TryParse(args["locomotion_state"].AsString(), out LocomotionState);
-
- if (args["head_rotation"] != null)
- Quaternion.TryParse(args["head_rotation"].AsString(), out HeadRotation);
-
- if (args["body_rotation"] != null)
- Quaternion.TryParse(args["body_rotation"].AsString(), out BodyRotation);
-
- if (args["control_flags"] != null)
- UInt32.TryParse(args["control_flags"].AsString(), out ControlFlags);
-
- if (args["energy_level"] != null)
- EnergyLevel = (float)(args["energy_level"].AsReal());
-
- if (args["god_level"] != null)
- Byte.TryParse(args["god_level"].AsString(), out GodLevel);
-
- if (args["always_run"] != null)
- AlwaysRun = args["always_run"].AsBoolean();
-
- if (args["prey_agent"] != null)
- PreyAgent = args["prey_agent"].AsUUID();
-
- if (args["agent_access"] != null)
- Byte.TryParse(args["agent_access"].AsString(), out AgentAccess);
-
- if ((args["agent_textures"] != null) && (args["agent_textures"]).Type == OSDType.Array)
- {
- OSDArray textures = (OSDArray)(args["agent_textures"]);
- AgentTextures = new UUID[textures.Count];
- int i = 0;
- foreach (OSD o in textures)
- AgentTextures[i++] = o.AsUUID();
- }
-
- if (args["active_group_id"] != null)
- ActiveGroupID = args["active_group_id"].AsUUID();
-
- if ((args["groups"] != null) && (args["groups"]).Type == OSDType.Array)
- {
- OSDArray groups = (OSDArray)(args["groups"]);
- Groups = new AgentGroupData[groups.Count];
- int i = 0;
- foreach (OSD o in groups)
- {
- if (o.Type == OSDType.Map)
- {
- Groups[i++] = new AgentGroupData((OSDMap)o);
- }
- }
- }
-
- if ((args["animations"] != null) && (args["animations"]).Type == OSDType.Array)
- {
- OSDArray anims = (OSDArray)(args["animations"]);
- Anims = new Animation[anims.Count];
- int i = 0;
- foreach (OSD o in anims)
- {
- if (o.Type == OSDType.Map)
- {
- Anims[i++] = new Animation((OSDMap)o);
- }
- }
- }
-
- if (args["visual_params"] != null)
- VisualParams = args["visual_params"].AsBinary();
-
- if (args["callback_uri"] != null)
- CallbackURI = args["callback_uri"].AsString();
- }
-
- public AgentData()
- {
- }
-
- public AgentData(Hashtable hash)
- {
- //UnpackUpdateMessage(hash);
- }
-
- public void Dump()
- {
- System.Console.WriteLine("------------ AgentData ------------");
- System.Console.WriteLine("UUID: " + AgentID);
- System.Console.WriteLine("Region: " + RegionHandle);
- System.Console.WriteLine("Position: " + Position);
- }
- }
-
-}
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSim Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using OpenSim.Framework;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+
+namespace OpenSim.Region.Framework.Scenes
+{
+ public interface IAgentData
+ {
+ UUID AgentID { get; set; }
+
+ OSDMap PackUpdateMessage();
+ void UnpackUpdateMessage(OSDMap map);
+ }
+
+ ///
+ /// Replacement for ChildAgentDataUpdate. Used over RESTComms and LocalComms.
+ ///
+ public class AgentPosition : IAgentData
+ {
+ private UUID m_id;
+ public UUID AgentID
+ {
+ get { return m_id; }
+ set { m_id = value; }
+ }
+
+ public ulong RegionHandle;
+ public uint CircuitCode;
+ public UUID SessionID;
+
+ public float Far;
+ public Vector3 Position;
+ public Vector3 Velocity;
+ public Vector3 Center;
+ public Vector3 Size;
+ public Vector3 AtAxis;
+ public Vector3 LeftAxis;
+ public Vector3 UpAxis;
+ public bool ChangedGrid;
+
+ // This probably shouldn't be here
+ public byte[] Throttles;
+
+
+ public OSDMap PackUpdateMessage()
+ {
+ OSDMap args = new OSDMap();
+ args["message_type"] = OSD.FromString("AgentPosition");
+
+ args["region_handle"] = OSD.FromString(RegionHandle.ToString());
+ args["circuit_code"] = OSD.FromString(CircuitCode.ToString());
+ args["agent_uuid"] = OSD.FromUUID(AgentID);
+ args["session_uuid"] = OSD.FromUUID(SessionID);
+
+ args["position"] = OSD.FromString(Position.ToString());
+ args["velocity"] = OSD.FromString(Velocity.ToString());
+ args["center"] = OSD.FromString(Center.ToString());
+ args["size"] = OSD.FromString(Size.ToString());
+ args["at_axis"] = OSD.FromString(AtAxis.ToString());
+ args["left_axis"] = OSD.FromString(LeftAxis.ToString());
+ args["up_axis"] = OSD.FromString(UpAxis.ToString());
+
+ args["far"] = OSD.FromReal(Far);
+ args["changed_grid"] = OSD.FromBoolean(ChangedGrid);
+
+ if ((Throttles != null) && (Throttles.Length > 0))
+ args["throttles"] = OSD.FromBinary(Throttles);
+
+ return args;
+ }
+
+ public void UnpackUpdateMessage(OSDMap args)
+ {
+ if (args.ContainsKey("region_handle"))
+ UInt64.TryParse(args["region_handle"].AsString(), out RegionHandle);
+
+ if (args["circuit_code"] != null)
+ UInt32.TryParse((string)args["circuit_code"].AsString(), out CircuitCode);
+
+ if (args["agent_uuid"] != null)
+ AgentID = args["agent_uuid"].AsUUID();
+
+ if (args["session_uuid"] != null)
+ SessionID = args["session_uuid"].AsUUID();
+
+ if (args["position"] != null)
+ Vector3.TryParse(args["position"].AsString(), out Position);
+
+ if (args["velocity"] != null)
+ Vector3.TryParse(args["velocity"].AsString(), out Velocity);
+
+ if (args["center"] != null)
+ Vector3.TryParse(args["center"].AsString(), out Center);
+
+ if (args["size"] != null)
+ Vector3.TryParse(args["size"].AsString(), out Size);
+
+ if (args["at_axis"] != null)
+ Vector3.TryParse(args["at_axis"].AsString(), out AtAxis);
+
+ if (args["left_axis"] != null)
+ Vector3.TryParse(args["left_axis"].AsString(), out AtAxis);
+
+ if (args["up_axis"] != null)
+ Vector3.TryParse(args["up_axis"].AsString(), out AtAxis);
+
+ if (args["changed_grid"] != null)
+ ChangedGrid = args["changed_grid"].AsBoolean();
+
+ if (args["far"] != null)
+ Far = (float)(args["far"].AsReal());
+
+ if (args["throttles"] != null)
+ Throttles = args["throttles"].AsBinary();
+ }
+
+ ///
+ /// Soon to be decommissioned
+ ///
+ ///
+ public void CopyFrom(ChildAgentDataUpdate cAgent)
+ {
+ AgentID = new UUID(cAgent.AgentID);
+
+ // next: ???
+ Size = new Vector3();
+ Size.Z = cAgent.AVHeight;
+
+ Center = new Vector3(cAgent.cameraPosition.x, cAgent.cameraPosition.y, cAgent.cameraPosition.z);
+ Far = cAgent.drawdistance;
+ Position = new Vector3(cAgent.Position.x, cAgent.Position.y, cAgent.Position.z);
+ RegionHandle = cAgent.regionHandle;
+ Throttles = cAgent.throttles;
+ Velocity = new Vector3(cAgent.Velocity.x, cAgent.Velocity.y, cAgent.Velocity.z);
+ }
+
+ }
+
+ public class AgentGroupData
+ {
+ public UUID GroupID;
+ public ulong GroupPowers;
+ public bool AcceptNotices;
+
+ public AgentGroupData(UUID id, ulong powers, bool notices)
+ {
+ GroupID = id;
+ GroupPowers = powers;
+ AcceptNotices = notices;
+ }
+
+ public AgentGroupData(OSDMap args)
+ {
+ UnpackUpdateMessage(args);
+ }
+
+ public OSDMap PackUpdateMessage()
+ {
+ OSDMap groupdata = new OSDMap();
+ groupdata["group_id"] = OSD.FromUUID(GroupID);
+ groupdata["group_powers"] = OSD.FromString(GroupPowers.ToString());
+ groupdata["accept_notices"] = OSD.FromBoolean(AcceptNotices);
+
+ return groupdata;
+ }
+
+ public void UnpackUpdateMessage(OSDMap args)
+ {
+ if (args["group_id"] != null)
+ GroupID = args["group_id"].AsUUID();
+ if (args["group_powers"] != null)
+ UInt64.TryParse((string)args["group_powers"].AsString(), out GroupPowers);
+ if (args["accept_notices"] != null)
+ AcceptNotices = args["accept_notices"].AsBoolean();
+ }
+ }
+
+ //public class AgentAnimationData
+ //{
+ // public UUID Animation;
+ // public UUID ObjectID;
+
+ // public AgentAnimationData(UUID anim, UUID obj)
+ // {
+ // Animation = anim;
+ // ObjectID = obj;
+ // }
+
+ // public AgentAnimationData(OSDMap args)
+ // {
+ // UnpackUpdateMessage(args);
+ // }
+
+ // public OSDMap PackUpdateMessage()
+ // {
+ // OSDMap anim = new OSDMap();
+ // anim["animation"] = OSD.FromUUID(Animation);
+ // anim["object_id"] = OSD.FromUUID(ObjectID);
+ // return anim;
+ // }
+
+ // public void UnpackUpdateMessage(OSDMap args)
+ // {
+ // if (args["animation"] != null)
+ // Animation = args["animation"].AsUUID();
+ // if (args["object_id"] != null)
+ // ObjectID = args["object_id"].AsUUID();
+ // }
+ //}
+
+ public class AgentData : IAgentData
+ {
+ private UUID m_id;
+ public UUID AgentID
+ {
+ get { return m_id; }
+ set { m_id = value; }
+ }
+ public ulong RegionHandle;
+ public uint CircuitCode;
+ public UUID SessionID;
+
+ public Vector3 Position;
+ public Vector3 Velocity;
+ public Vector3 Center;
+ public Vector3 Size;
+ public Vector3 AtAxis;
+ public Vector3 LeftAxis;
+ public Vector3 UpAxis;
+ public bool ChangedGrid;
+
+ public float Far;
+ public float Aspect;
+ //public int[] Throttles;
+ public byte[] Throttles;
+
+ public uint LocomotionState;
+ public Quaternion HeadRotation;
+ public Quaternion BodyRotation;
+ public uint ControlFlags;
+ public float EnergyLevel;
+ public Byte GodLevel;
+ public bool AlwaysRun;
+ public UUID PreyAgent;
+ public Byte AgentAccess;
+ public UUID[] AgentTextures;
+ public UUID ActiveGroupID;
+
+ public AgentGroupData[] Groups;
+ public Animation[] Anims;
+
+ public UUID GranterID;
+ public Dictionary NVPairs;
+
+ public byte[] VisualParams;
+
+ public string CallbackURI;
+
+ public OSDMap PackUpdateMessage()
+ {
+ OSDMap args = new OSDMap();
+ args["message_type"] = OSD.FromString("AgentData");
+
+ args["region_handle"] = OSD.FromString(RegionHandle.ToString());
+ args["circuit_code"] = OSD.FromString(CircuitCode.ToString());
+ args["agent_uuid"] = OSD.FromUUID(AgentID);
+ args["session_uuid"] = OSD.FromUUID(SessionID);
+
+ args["position"] = OSD.FromString(Position.ToString());
+ args["velocity"] = OSD.FromString(Velocity.ToString());
+ args["center"] = OSD.FromString(Center.ToString());
+ args["size"] = OSD.FromString(Size.ToString());
+ args["at_axis"] = OSD.FromString(AtAxis.ToString());
+ args["left_axis"] = OSD.FromString(LeftAxis.ToString());
+ args["up_axis"] = OSD.FromString(UpAxis.ToString());
+
+ args["changed_grid"] = OSD.FromBoolean(ChangedGrid);
+ args["far"] = OSD.FromReal(Far);
+ args["aspect"] = OSD.FromReal(Aspect);
+
+ if ((Throttles != null) && (Throttles.Length > 0))
+ args["throttles"] = OSD.FromBinary(Throttles);
+
+ args["locomotion_state"] = OSD.FromString(LocomotionState.ToString());
+ args["head_rotation"] = OSD.FromString(HeadRotation.ToString());
+ args["body_rotation"] = OSD.FromString(BodyRotation.ToString());
+ args["control_flags"] = OSD.FromString(ControlFlags.ToString());
+
+ args["energy_level"] = OSD.FromReal(EnergyLevel);
+ args["god_level"] = OSD.FromString(GodLevel.ToString());
+ args["always_run"] = OSD.FromBoolean(AlwaysRun);
+ args["prey_agent"] = OSD.FromUUID(PreyAgent);
+ args["agent_access"] = OSD.FromString(AgentAccess.ToString());
+
+ if ((AgentTextures != null) && (AgentTextures.Length > 0))
+ {
+ OSDArray textures = new OSDArray(AgentTextures.Length);
+ foreach (UUID uuid in AgentTextures)
+ textures.Add(OSD.FromUUID(uuid));
+ args["agent_textures"] = textures;
+ }
+
+ args["active_group_id"] = OSD.FromUUID(ActiveGroupID);
+
+ if ((Groups != null) && (Groups.Length > 0))
+ {
+ OSDArray groups = new OSDArray(Groups.Length);
+ foreach (AgentGroupData agd in Groups)
+ groups.Add(agd.PackUpdateMessage());
+ args["groups"] = groups;
+ }
+
+ if ((Anims != null) && (Anims.Length > 0))
+ {
+ OSDArray anims = new OSDArray(Anims.Length);
+ foreach (Animation aanim in Anims)
+ anims.Add(aanim.PackUpdateMessage());
+ args["animations"] = anims;
+ }
+
+ if ((VisualParams != null) && (VisualParams.Length > 0))
+ args["visual_params"] = OSD.FromBinary(VisualParams);
+
+ // Last few fields are still missing: granter and NVPais
+
+ if ((CallbackURI != null) && (!CallbackURI.Equals("")))
+ args["callback_uri"] = OSD.FromString(CallbackURI);
+
+ return args;
+ }
+
+ ///
+ /// Deserialization of agent data.
+ /// Avoiding reflection makes it painful to write, but that's the price!
+ ///
+ ///
+ public void UnpackUpdateMessage(OSDMap args)
+ {
+ if (args.ContainsKey("region_handle"))
+ UInt64.TryParse(args["region_handle"].AsString(), out RegionHandle);
+
+ if (args["circuit_code"] != null)
+ UInt32.TryParse((string)args["circuit_code"].AsString(), out CircuitCode);
+
+ if (args["agent_uuid"] != null)
+ AgentID = args["agent_uuid"].AsUUID();
+
+ if (args["session_uuid"] != null)
+ SessionID = args["session_uuid"].AsUUID();
+
+ if (args["position"] != null)
+ Vector3.TryParse(args["position"].AsString(), out Position);
+
+ if (args["velocity"] != null)
+ Vector3.TryParse(args["velocity"].AsString(), out Velocity);
+
+ if (args["center"] != null)
+ Vector3.TryParse(args["center"].AsString(), out Center);
+
+ if (args["size"] != null)
+ Vector3.TryParse(args["size"].AsString(), out Size);
+
+ if (args["at_axis"] != null)
+ Vector3.TryParse(args["at_axis"].AsString(), out AtAxis);
+
+ if (args["left_axis"] != null)
+ Vector3.TryParse(args["left_axis"].AsString(), out AtAxis);
+
+ if (args["up_axis"] != null)
+ Vector3.TryParse(args["up_axis"].AsString(), out AtAxis);
+
+ if (args["changed_grid"] != null)
+ ChangedGrid = args["changed_grid"].AsBoolean();
+
+ if (args["far"] != null)
+ Far = (float)(args["far"].AsReal());
+
+ if (args["aspect"] != null)
+ Aspect = (float)args["aspect"].AsReal();
+
+ if (args["throttles"] != null)
+ Throttles = args["throttles"].AsBinary();
+
+ if (args["locomotion_state"] != null)
+ UInt32.TryParse(args["locomotion_state"].AsString(), out LocomotionState);
+
+ if (args["head_rotation"] != null)
+ Quaternion.TryParse(args["head_rotation"].AsString(), out HeadRotation);
+
+ if (args["body_rotation"] != null)
+ Quaternion.TryParse(args["body_rotation"].AsString(), out BodyRotation);
+
+ if (args["control_flags"] != null)
+ UInt32.TryParse(args["control_flags"].AsString(), out ControlFlags);
+
+ if (args["energy_level"] != null)
+ EnergyLevel = (float)(args["energy_level"].AsReal());
+
+ if (args["god_level"] != null)
+ Byte.TryParse(args["god_level"].AsString(), out GodLevel);
+
+ if (args["always_run"] != null)
+ AlwaysRun = args["always_run"].AsBoolean();
+
+ if (args["prey_agent"] != null)
+ PreyAgent = args["prey_agent"].AsUUID();
+
+ if (args["agent_access"] != null)
+ Byte.TryParse(args["agent_access"].AsString(), out AgentAccess);
+
+ if ((args["agent_textures"] != null) && (args["agent_textures"]).Type == OSDType.Array)
+ {
+ OSDArray textures = (OSDArray)(args["agent_textures"]);
+ AgentTextures = new UUID[textures.Count];
+ int i = 0;
+ foreach (OSD o in textures)
+ AgentTextures[i++] = o.AsUUID();
+ }
+
+ if (args["active_group_id"] != null)
+ ActiveGroupID = args["active_group_id"].AsUUID();
+
+ if ((args["groups"] != null) && (args["groups"]).Type == OSDType.Array)
+ {
+ OSDArray groups = (OSDArray)(args["groups"]);
+ Groups = new AgentGroupData[groups.Count];
+ int i = 0;
+ foreach (OSD o in groups)
+ {
+ if (o.Type == OSDType.Map)
+ {
+ Groups[i++] = new AgentGroupData((OSDMap)o);
+ }
+ }
+ }
+
+ if ((args["animations"] != null) && (args["animations"]).Type == OSDType.Array)
+ {
+ OSDArray anims = (OSDArray)(args["animations"]);
+ Anims = new Animation[anims.Count];
+ int i = 0;
+ foreach (OSD o in anims)
+ {
+ if (o.Type == OSDType.Map)
+ {
+ Anims[i++] = new Animation((OSDMap)o);
+ }
+ }
+ }
+
+ if (args["visual_params"] != null)
+ VisualParams = args["visual_params"].AsBinary();
+
+ if (args["callback_uri"] != null)
+ CallbackURI = args["callback_uri"].AsString();
+ }
+
+ public AgentData()
+ {
+ }
+
+ public AgentData(Hashtable hash)
+ {
+ //UnpackUpdateMessage(hash);
+ }
+
+ public void Dump()
+ {
+ System.Console.WriteLine("------------ AgentData ------------");
+ System.Console.WriteLine("UUID: " + AgentID);
+ System.Console.WriteLine("Region: " + RegionHandle);
+ System.Console.WriteLine("Position: " + Position);
+ }
+ }
+
+}
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index f5d7b32..4eb8a28 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1379,7 +1379,6 @@ namespace OpenSim.Region.Framework.Scenes
if (part != null)
{
-
TaskInventoryItem currentItem = part.Inventory.GetInventoryItem(itemID);
bool allowInventoryDrop = (part.GetEffectiveObjectFlags()
& (uint)PrimFlags.AllowInventoryDrop) != 0;
diff --git a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
index 51aa8f8..604b21d 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
@@ -282,7 +282,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
{
m_log.DebugFormat("[Concierge]: {0} logs off from {1}", client.Name, client.Scene.RegionInfo.RegionName);
RemoveFromAttendeeList(client.AgentId, client.Name, client.Scene);
- lock(m_sceneAttendees)
+ lock (m_sceneAttendees)
{
AnnounceToAgentsRegion(client.Scene, String.Format(m_announceLeaving, client.Name, client.Scene.RegionInfo.RegionName,
m_sceneAttendees[client.Scene].Count));
@@ -406,7 +406,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
attendees.Count, scene.RegionInfo.RegionName,
scene.RegionInfo.RegionID,
DateTime.UtcNow.ToString("s")));
- lock(m_sceneAttendees)
+ lock (m_sceneAttendees)
{
foreach (UUID uuid in attendees)
{
@@ -458,7 +458,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
string payload = bs.Payload;
HttpWebRequest updatePost = bs.Poster;
- using(StreamWriter payloadStream = new StreamWriter(updatePost.EndGetRequestStream(result)))
+ using (StreamWriter payloadStream = new StreamWriter(updatePost.EndGetRequestStream(result)))
{
payloadStream.Write(payload);
payloadStream.Close();
--
cgit v1.1