diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs index bcfce3ff3a..f807b2ba27 100644 --- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs +++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs @@ -23,7 +23,7 @@ namespace OpenSim.Framework.Communications.Caches InventoryFolder folderInfo = new InventoryFolder(); folderInfo.agentID = libOwner; folderInfo.folderID = new LLUUID("00000112-000f-0000-0000-000100bba001"); - folderInfo.name = "My Inventory"; + folderInfo.name = "Texture Library"; folderInfo.parentID = this.folderID; folderInfo.type = -1; folderInfo.version = 1; diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs index 3b1cc6a649..5df66f467a 100644 --- a/OpenSim/Framework/Communications/Capabilities/Caps.cs +++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs @@ -82,7 +82,10 @@ namespace OpenSim.Region.Capabilities AddLegacyCapsHandler(httpListener, m_notecardUpdatePath, NoteCardAgentInventory); } - [Obsolete("Use BaseHttpServer.AddStreamHandler(new LLSDStreamHandler( LLSDMethod delegate )) instead.")] + + //[Obsolete("Use BaseHttpServer.AddStreamHandler(new LLSDStreamHandler( LLSDMethod delegate )) instead.")] + //Commented out the obsolete as at this time the first caps request can not use the new Caps method + //as the sent type is a array and not a map and the deserialising doesn't deal properly with arrays. private void AddLegacyCapsHandler(BaseHttpServer httpListener, string path, RestMethod restMethod) { string capsBase = "/CAPS/" + m_capsObjectPath; diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs index 0bfd8272fb..260da81093 100644 --- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs +++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs @@ -126,7 +126,6 @@ namespace OpenSim.Framework.Interfaces event UpdateVector OnUpdatePrimScale; event StatusChange OnChildAgentStatus; event GenericCall2 OnStopMovement; - event NewAvatar OnNewAvatar; event GenericCall6 OnRemoveAvatar; event CreateNewInventoryItem OnCreateNewInventoryItem; diff --git a/OpenSim/Framework/General/NullClientAPI.cs b/OpenSim/Framework/General/NullClientAPI.cs index aefb3846d3..9815acafe4 100644 --- a/OpenSim/Framework/General/NullClientAPI.cs +++ b/OpenSim/Framework/General/NullClientAPI.cs @@ -49,7 +49,6 @@ namespace OpenSim.Framework public event UpdateVector OnUpdatePrimScale; public event StatusChange OnChildAgentStatus; public event GenericCall2 OnStopMovement; - public event NewAvatar OnNewAvatar; public event GenericCall6 OnRemoveAvatar; public event CreateNewInventoryItem OnCreateNewInventoryItem; diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs index 7e1820baad..9a296f1355 100644 --- a/OpenSim/Region/ClientStack/ClientView.API.cs +++ b/OpenSim/Region/ClientStack/ClientView.API.cs @@ -74,10 +74,9 @@ namespace OpenSim.Region.ClientStack public event UpdatePrimSingleRotation OnUpdatePrimSingleRotation; public event UpdatePrimGroupRotation OnUpdatePrimGroupMouseRotation; public event UpdateVector OnUpdatePrimScale; - public event StatusChange OnChildAgentStatus; // HOUSEKEEPING : Do we really need this? - public event GenericCall2 OnStopMovement; // HOUSEKEEPING : Do we really need this? - public event NewAvatar OnNewAvatar; // HOUSEKEEPING : Do we really need this? - public event GenericCall6 OnRemoveAvatar; // HOUSEKEEPING : Do we really need this? + public event StatusChange OnChildAgentStatus; + public event GenericCall2 OnStopMovement; + public event GenericCall6 OnRemoveAvatar; public event RequestMapBlocks OnRequestMapBlocks; public event TeleportLocationRequest OnTeleportLocationRequest; diff --git a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs index fd494fa1d2..82d4cd04f7 100644 --- a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs +++ b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs @@ -14,6 +14,7 @@ namespace OpenSim.Region.Environment.Scenes { private const uint FULL_MASK_PERMISSIONS = 2147483647; + private uint m_flags = 32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456 + 128; private ulong m_regionHandle; public string SitName = ""; @@ -127,6 +128,12 @@ namespace OpenSim.Region.Environment.Scenes this.m_Shape = shape; this.OffsetPosition = position; + + //temporary code just so the m_flags field doesn't give a compiler warning + if (m_flags == 1) + { + + } } #endregion diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index fa2b36a21a..124b4260c5 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs @@ -66,6 +66,8 @@ namespace OpenSim.Region.Environment.Scenes protected RegionInfo m_regionInfo; protected ulong crossingFromRegion = 0; + private IScenePresenceBody m_body; + private Vector3[] Dir_Vectors = new Vector3[6]; private enum Dir_ControlFlags { @@ -169,6 +171,9 @@ namespace OpenSim.Region.Environment.Scenes Dir_Vectors[3] = new Vector3(0, -1, 0); //RIGHT Dir_Vectors[4] = new Vector3(0, 0, 1); //UP Dir_Vectors[5] = new Vector3(0, 0, -1); //DOWN + + //tempoary until we move some code into the body classes + this.m_body = new ChildAgent(); } #endregion diff --git a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs index dd307590b9..1593f6cf5e 100644 --- a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs @@ -63,7 +63,6 @@ namespace SimpleApp public event UpdateVector OnUpdatePrimScale; public event StatusChange OnChildAgentStatus; public event GenericCall2 OnStopMovement; - public event NewAvatar OnNewAvatar; public event GenericCall6 OnRemoveAvatar; public event CreateNewInventoryItem OnCreateNewInventoryItem;