aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMW2007-07-27 12:21:52 +0000
committerMW2007-07-27 12:21:52 +0000
commitd143e7b074111c2a4796c6caf05ea5030412d44b (patch)
treefab873ac99db74c6db0badf677df8345586bd787
parent* Removing some housekeeping tagged elements. (diff)
downloadopensim-SC_OLD-d143e7b074111c2a4796c6caf05ea5030412d44b.zip
opensim-SC_OLD-d143e7b074111c2a4796c6caf05ea5030412d44b.tar.gz
opensim-SC_OLD-d143e7b074111c2a4796c6caf05ea5030412d44b.tar.bz2
opensim-SC_OLD-d143e7b074111c2a4796c6caf05ea5030412d44b.tar.xz
A few changes so that the number of warnings is less but without deleting everything.
Like, I removed the Obsolete from the old caps method as at this time not all caps calls can use the new Caps stream method as it doesn't properly deal with LLSD Arrays. Now down to 3 warnings on the events in IClientAPI and for now I think we have to live with them as I think most of those events will be used.
-rw-r--r--OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs2
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs5
-rw-r--r--OpenSim/Framework/General/Interfaces/IClientAPI.cs1
-rw-r--r--OpenSim/Framework/General/NullClientAPI.cs1
-rw-r--r--OpenSim/Region/ClientStack/ClientView.API.cs7
-rw-r--r--OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs7
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs5
-rw-r--r--OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs1
8 files changed, 20 insertions, 9 deletions
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
index bcfce3f..f807b2b 100644
--- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
+++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
@@ -23,7 +23,7 @@ namespace OpenSim.Framework.Communications.Caches
23 InventoryFolder folderInfo = new InventoryFolder(); 23 InventoryFolder folderInfo = new InventoryFolder();
24 folderInfo.agentID = libOwner; 24 folderInfo.agentID = libOwner;
25 folderInfo.folderID = new LLUUID("00000112-000f-0000-0000-000100bba001"); 25 folderInfo.folderID = new LLUUID("00000112-000f-0000-0000-000100bba001");
26 folderInfo.name = "My Inventory"; 26 folderInfo.name = "Texture Library";
27 folderInfo.parentID = this.folderID; 27 folderInfo.parentID = this.folderID;
28 folderInfo.type = -1; 28 folderInfo.type = -1;
29 folderInfo.version = 1; 29 folderInfo.version = 1;
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index 3b1cc6a..5df66f4 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -82,7 +82,10 @@ namespace OpenSim.Region.Capabilities
82 AddLegacyCapsHandler(httpListener, m_notecardUpdatePath, NoteCardAgentInventory); 82 AddLegacyCapsHandler(httpListener, m_notecardUpdatePath, NoteCardAgentInventory);
83 } 83 }
84 84
85 [Obsolete("Use BaseHttpServer.AddStreamHandler(new LLSDStreamHandler( LLSDMethod delegate )) instead.")] 85
86 //[Obsolete("Use BaseHttpServer.AddStreamHandler(new LLSDStreamHandler( LLSDMethod delegate )) instead.")]
87 //Commented out the obsolete as at this time the first caps request can not use the new Caps method
88 //as the sent type is a array and not a map and the deserialising doesn't deal properly with arrays.
86 private void AddLegacyCapsHandler(BaseHttpServer httpListener, string path, RestMethod restMethod) 89 private void AddLegacyCapsHandler(BaseHttpServer httpListener, string path, RestMethod restMethod)
87 { 90 {
88 string capsBase = "/CAPS/" + m_capsObjectPath; 91 string capsBase = "/CAPS/" + m_capsObjectPath;
diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
index 0bfd827..260da81 100644
--- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs
+++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
@@ -126,7 +126,6 @@ namespace OpenSim.Framework.Interfaces
126 event UpdateVector OnUpdatePrimScale; 126 event UpdateVector OnUpdatePrimScale;
127 event StatusChange OnChildAgentStatus; 127 event StatusChange OnChildAgentStatus;
128 event GenericCall2 OnStopMovement; 128 event GenericCall2 OnStopMovement;
129 event NewAvatar OnNewAvatar;
130 event GenericCall6 OnRemoveAvatar; 129 event GenericCall6 OnRemoveAvatar;
131 130
132 event CreateNewInventoryItem OnCreateNewInventoryItem; 131 event CreateNewInventoryItem OnCreateNewInventoryItem;
diff --git a/OpenSim/Framework/General/NullClientAPI.cs b/OpenSim/Framework/General/NullClientAPI.cs
index aefb384..9815aca 100644
--- a/OpenSim/Framework/General/NullClientAPI.cs
+++ b/OpenSim/Framework/General/NullClientAPI.cs
@@ -49,7 +49,6 @@ namespace OpenSim.Framework
49 public event UpdateVector OnUpdatePrimScale; 49 public event UpdateVector OnUpdatePrimScale;
50 public event StatusChange OnChildAgentStatus; 50 public event StatusChange OnChildAgentStatus;
51 public event GenericCall2 OnStopMovement; 51 public event GenericCall2 OnStopMovement;
52 public event NewAvatar OnNewAvatar;
53 public event GenericCall6 OnRemoveAvatar; 52 public event GenericCall6 OnRemoveAvatar;
54 53
55 public event CreateNewInventoryItem OnCreateNewInventoryItem; 54 public event CreateNewInventoryItem OnCreateNewInventoryItem;
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 7e1820b..9a296f1 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -74,10 +74,9 @@ namespace OpenSim.Region.ClientStack
74 public event UpdatePrimSingleRotation OnUpdatePrimSingleRotation; 74 public event UpdatePrimSingleRotation OnUpdatePrimSingleRotation;
75 public event UpdatePrimGroupRotation OnUpdatePrimGroupMouseRotation; 75 public event UpdatePrimGroupRotation OnUpdatePrimGroupMouseRotation;
76 public event UpdateVector OnUpdatePrimScale; 76 public event UpdateVector OnUpdatePrimScale;
77 public event StatusChange OnChildAgentStatus; // HOUSEKEEPING : Do we really need this? 77 public event StatusChange OnChildAgentStatus;
78 public event GenericCall2 OnStopMovement; // HOUSEKEEPING : Do we really need this? 78 public event GenericCall2 OnStopMovement;
79 public event NewAvatar OnNewAvatar; // HOUSEKEEPING : Do we really need this? 79 public event GenericCall6 OnRemoveAvatar;
80 public event GenericCall6 OnRemoveAvatar; // HOUSEKEEPING : Do we really need this?
81 public event RequestMapBlocks OnRequestMapBlocks; 80 public event RequestMapBlocks OnRequestMapBlocks;
82 public event TeleportLocationRequest OnTeleportLocationRequest; 81 public event TeleportLocationRequest OnTeleportLocationRequest;
83 82
diff --git a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs
index fd494fa..82d4cd0 100644
--- a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs
+++ b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs
@@ -14,6 +14,7 @@ namespace OpenSim.Region.Environment.Scenes
14 { 14 {
15 private const uint FULL_MASK_PERMISSIONS = 2147483647; 15 private const uint FULL_MASK_PERMISSIONS = 2147483647;
16 16
17 private uint m_flags = 32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456 + 128;
17 private ulong m_regionHandle; 18 private ulong m_regionHandle;
18 19
19 public string SitName = ""; 20 public string SitName = "";
@@ -127,6 +128,12 @@ namespace OpenSim.Region.Environment.Scenes
127 this.m_Shape = shape; 128 this.m_Shape = shape;
128 129
129 this.OffsetPosition = position; 130 this.OffsetPosition = position;
131
132 //temporary code just so the m_flags field doesn't give a compiler warning
133 if (m_flags == 1)
134 {
135
136 }
130 } 137 }
131 #endregion 138 #endregion
132 139
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index fa2b36a..124b426 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -66,6 +66,8 @@ namespace OpenSim.Region.Environment.Scenes
66 protected RegionInfo m_regionInfo; 66 protected RegionInfo m_regionInfo;
67 protected ulong crossingFromRegion = 0; 67 protected ulong crossingFromRegion = 0;
68 68
69 private IScenePresenceBody m_body;
70
69 private Vector3[] Dir_Vectors = new Vector3[6]; 71 private Vector3[] Dir_Vectors = new Vector3[6];
70 private enum Dir_ControlFlags 72 private enum Dir_ControlFlags
71 { 73 {
@@ -169,6 +171,9 @@ namespace OpenSim.Region.Environment.Scenes
169 Dir_Vectors[3] = new Vector3(0, -1, 0); //RIGHT 171 Dir_Vectors[3] = new Vector3(0, -1, 0); //RIGHT
170 Dir_Vectors[4] = new Vector3(0, 0, 1); //UP 172 Dir_Vectors[4] = new Vector3(0, 0, 1); //UP
171 Dir_Vectors[5] = new Vector3(0, 0, -1); //DOWN 173 Dir_Vectors[5] = new Vector3(0, 0, -1); //DOWN
174
175 //tempoary until we move some code into the body classes
176 this.m_body = new ChildAgent();
172 177
173 } 178 }
174 #endregion 179 #endregion
diff --git a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
index dd30759..1593f6c 100644
--- a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
@@ -63,7 +63,6 @@ namespace SimpleApp
63 public event UpdateVector OnUpdatePrimScale; 63 public event UpdateVector OnUpdatePrimScale;
64 public event StatusChange OnChildAgentStatus; 64 public event StatusChange OnChildAgentStatus;
65 public event GenericCall2 OnStopMovement; 65 public event GenericCall2 OnStopMovement;
66 public event NewAvatar OnNewAvatar;
67 public event GenericCall6 OnRemoveAvatar; 66 public event GenericCall6 OnRemoveAvatar;
68 67
69 public event CreateNewInventoryItem OnCreateNewInventoryItem; 68 public event CreateNewInventoryItem OnCreateNewInventoryItem;