aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2012-07-01 03:04:23 +0100
committerMelanie2012-07-01 03:04:23 +0100
commite5eef139ede23f73c3aaccfc54084dfe81bd891a (patch)
tree41058b7c930f87652bc03b60a9e53c041f13ebc9
parentMerge branch 'master' into careminster (diff)
parentRemove some mono compiler warnings (diff)
downloadopensim-SC_OLD-e5eef139ede23f73c3aaccfc54084dfe81bd891a.zip
opensim-SC_OLD-e5eef139ede23f73c3aaccfc54084dfe81bd891a.tar.gz
opensim-SC_OLD-e5eef139ede23f73c3aaccfc54084dfe81bd891a.tar.bz2
opensim-SC_OLD-e5eef139ede23f73c3aaccfc54084dfe81bd891a.tar.xz
Merge branch 'master' into careminster
-rw-r--r--OpenSim/Framework/Serialization/External/LandDataSerializer.cs2
-rw-r--r--OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs18
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs9
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs38
-rw-r--r--OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPrim.cs5
-rw-r--r--OpenSim/Server/Base/HttpServerBase.cs4
-rw-r--r--OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs48
-rw-r--r--OpenSim/Services/HypergridService/GatekeeperService.cs2
-rw-r--r--OpenSim/Services/HypergridService/HGFriendsService.cs26
-rw-r--r--OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs4
-rw-r--r--OpenSim/Services/Interfaces/ISimulationService.cs10
12 files changed, 22 insertions, 146 deletions
diff --git a/OpenSim/Framework/Serialization/External/LandDataSerializer.cs b/OpenSim/Framework/Serialization/External/LandDataSerializer.cs
index a12877a..e8d82d3 100644
--- a/OpenSim/Framework/Serialization/External/LandDataSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/LandDataSerializer.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Framework.Serialization.External
42 /// </summary> 42 /// </summary>
43 public class LandDataSerializer 43 public class LandDataSerializer
44 { 44 {
45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 45// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
46 46
47 protected static UTF8Encoding m_utf8Encoding = new UTF8Encoding(); 47 protected static UTF8Encoding m_utf8Encoding = new UTF8Encoding();
48 48
diff --git a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
index 57da7ca..88f9581 100644
--- a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Framework.Serialization.External
44 /// </summary> 44 /// </summary>
45 public class UserInventoryItemSerializer 45 public class UserInventoryItemSerializer
46 { 46 {
47 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 47// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
48 48
49 private static Dictionary<string, Action<InventoryItemBase, XmlTextReader>> m_InventoryItemXmlProcessors 49 private static Dictionary<string, Action<InventoryItemBase, XmlTextReader>> m_InventoryItemXmlProcessors
50 = new Dictionary<string, Action<InventoryItemBase, XmlTextReader>>(); 50 = new Dictionary<string, Action<InventoryItemBase, XmlTextReader>>();
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
index 008992e..6eb99ea 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
@@ -354,24 +354,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
354 return false; 354 return false;
355 } 355 }
356 356
357 public bool CreateObject(GridRegion destination, UUID userID, UUID itemID)
358 {
359 if (destination == null)
360 return false;
361
362 if (m_scenes.ContainsKey(destination.RegionID))
363 {
364// m_log.DebugFormat(
365// "[LOCAL SIMULATION CONNECTOR]: Found region {0} {1} to send AgentUpdate",
366// s.RegionInfo.RegionName, destination.RegionHandle);
367
368 return m_scenes[destination.RegionID].IncomingCreateObject(userID, itemID);
369 }
370
371 return false;
372 }
373
374
375 #endregion /* IInterregionComms */ 357 #endregion /* IInterregionComms */
376 358
377 #region Misc 359 #region Misc
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
index d395413..68be552 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
@@ -315,13 +315,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
315 return false; 315 return false;
316 } 316 }
317 317
318 public bool CreateObject(GridRegion destination, UUID userID, UUID itemID)
319 {
320 // Not Implemented
321 return false;
322 }
323
324 #endregion /* IInterregionComms */ 318 #endregion /* IInterregionComms */
325
326 } 319 }
327} 320} \ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 8c76b82..78edeb0 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2596,22 +2596,6 @@ namespace OpenSim.Region.Framework.Scenes
2596 newObject.RootPart.ParentGroup.CreateScriptInstances(0, false, DefaultScriptEngine, GetStateSource(newObject)); 2596 newObject.RootPart.ParentGroup.CreateScriptInstances(0, false, DefaultScriptEngine, GetStateSource(newObject));
2597 newObject.ResumeScripts(); 2597 newObject.ResumeScripts();
2598 } 2598 }
2599 else
2600 {
2601 ScenePresence sp;
2602 if (TryGetScenePresence(newObject.OwnerID, out sp))
2603 {
2604 // If the scene presence is here and already a root
2605 // agent, we came from a ;egacy region. Start the scripts
2606 // here as they used to start.
2607 // TODO: Remove in 0.7.3
2608 if (!sp.IsChildAgent)
2609 {
2610 newObject.RootPart.ParentGroup.CreateScriptInstances(0, false, DefaultScriptEngine, GetStateSource(newObject));
2611 newObject.ResumeScripts();
2612 }
2613 }
2614 }
2615 2599
2616 // Do this as late as possible so that listeners have full access to the incoming object 2600 // Do this as late as possible so that listeners have full access to the incoming object
2617 EventManager.TriggerOnIncomingSceneObject(newObject); 2601 EventManager.TriggerOnIncomingSceneObject(newObject);
@@ -2620,28 +2604,6 @@ namespace OpenSim.Region.Framework.Scenes
2620 } 2604 }
2621 2605
2622 /// <summary> 2606 /// <summary>
2623 /// Attachment rezzing
2624 /// </summary>
2625 /// <param name="userID">Agent Unique ID</param>
2626 /// <param name="itemID">Object ID</param>
2627 /// <returns>False</returns>
2628 public virtual bool IncomingCreateObject(UUID userID, UUID itemID)
2629 {
2630 m_log.DebugFormat(" >>> IncomingCreateObject(userID, itemID) <<< {0} {1}", userID, itemID);
2631
2632 // Commented out since this is as yet unused and is arguably not the appropriate place to do this, as
2633 // attachments are being rezzed elsewhere in AddNewClient()
2634// ScenePresence sp = GetScenePresence(userID);
2635// if (sp != null && AttachmentsModule != null)
2636// {
2637// uint attPt = (uint)sp.Appearance.GetAttachpoint(itemID);
2638// AttachmentsModule.RezSingleAttachmentFromInventory(sp.ControllingClient, itemID, attPt);
2639// }
2640
2641 return false;
2642 }
2643
2644 /// <summary>
2645 /// Adds a Scene Object group to the Scene. 2607 /// Adds a Scene Object group to the Scene.
2646 /// Verifies that the creator of the object is not banned from the simulator. 2608 /// Verifies that the creator of the object is not banned from the simulator.
2647 /// Checks if the item is an Attachment 2609 /// Checks if the item is an Attachment
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPrim.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPrim.cs
index b89eeed..47d7df3 100644
--- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPrim.cs
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPrim.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
37 public class BasicPhysicsPrim : PhysicsActor 37 public class BasicPhysicsPrim : PhysicsActor
38 { 38 {
39 private Vector3 _size; 39 private Vector3 _size;
40 private PrimitiveBaseShape _shape; 40// private PrimitiveBaseShape _shape;
41 41
42 public BasicPhysicsPrim( 42 public BasicPhysicsPrim(
43 string name, uint localId, Vector3 position, Vector3 size, Quaternion orientation, PrimitiveBaseShape shape) 43 string name, uint localId, Vector3 position, Vector3 size, Quaternion orientation, PrimitiveBaseShape shape)
@@ -136,7 +136,8 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
136 136
137 public override PrimitiveBaseShape Shape 137 public override PrimitiveBaseShape Shape
138 { 138 {
139 set { _shape = value; } 139// set { _shape = value; }
140 set {}
140 } 141 }
141 142
142 public override float Mass 143 public override float Mass
diff --git a/OpenSim/Server/Base/HttpServerBase.cs b/OpenSim/Server/Base/HttpServerBase.cs
index 7ba0ca8..29b1c00 100644
--- a/OpenSim/Server/Base/HttpServerBase.cs
+++ b/OpenSim/Server/Base/HttpServerBase.cs
@@ -40,9 +40,7 @@ namespace OpenSim.Server.Base
40{ 40{
41 public class HttpServerBase : ServicesServerBase 41 public class HttpServerBase : ServicesServerBase
42 { 42 {
43 // Logger 43// private static readonly ILog m_Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44 //
45 private static readonly ILog m_Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
46 44
47 private uint m_consolePort; 45 private uint m_consolePort;
48 46
diff --git a/OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs b/OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs
index a4d03ba..dbb1a15 100644
--- a/OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs
@@ -93,11 +93,6 @@ namespace OpenSim.Server.Handlers.Simulation
93 DoObjectPost(request, responsedata, regionID); 93 DoObjectPost(request, responsedata, regionID);
94 return responsedata; 94 return responsedata;
95 } 95 }
96 else if (method.Equals("PUT"))
97 {
98 DoObjectPut(request, responsedata, regionID);
99 return responsedata;
100 }
101 //else if (method.Equals("DELETE")) 96 //else if (method.Equals("DELETE"))
102 //{ 97 //{
103 // DoObjectDelete(request, responsedata, agentID, action, regionHandle); 98 // DoObjectDelete(request, responsedata, agentID, action, regionHandle);
@@ -219,48 +214,5 @@ namespace OpenSim.Server.Handlers.Simulation
219 { 214 {
220 return m_SimulationService.CreateObject(destination, newPosition, sog, false); 215 return m_SimulationService.CreateObject(destination, newPosition, sog, false);
221 } 216 }
222
223 protected virtual void DoObjectPut(Hashtable request, Hashtable responsedata, UUID regionID)
224 {
225 OSDMap args = Utils.GetOSDMap((string)request["body"]);
226 if (args == null)
227 {
228 responsedata["int_response_code"] = 400;
229 responsedata["str_response_string"] = "false";
230 return;
231 }
232
233 // retrieve the input arguments
234 int x = 0, y = 0;
235 UUID uuid = UUID.Zero;
236 string regionname = string.Empty;
237 if (args.ContainsKey("destination_x") && args["destination_x"] != null)
238 Int32.TryParse(args["destination_x"].AsString(), out x);
239 if (args.ContainsKey("destination_y") && args["destination_y"] != null)
240 Int32.TryParse(args["destination_y"].AsString(), out y);
241 if (args.ContainsKey("destination_uuid") && args["destination_uuid"] != null)
242 UUID.TryParse(args["destination_uuid"].AsString(), out uuid);
243 if (args.ContainsKey("destination_name") && args["destination_name"] != null)
244 regionname = args["destination_name"].ToString();
245
246 GridRegion destination = new GridRegion();
247 destination.RegionID = uuid;
248 destination.RegionLocX = x;
249 destination.RegionLocY = y;
250 destination.RegionName = regionname;
251
252 UUID userID = UUID.Zero, itemID = UUID.Zero;
253 if (args.ContainsKey("userid") && args["userid"] != null)
254 userID = args["userid"].AsUUID();
255 if (args.ContainsKey("itemid") && args["itemid"] != null)
256 itemID = args["itemid"].AsUUID();
257
258 // This is the meaning of PUT object
259 bool result = m_SimulationService.CreateObject(destination, userID, itemID);
260
261 responsedata["int_response_code"] = 200;
262 responsedata["str_response_string"] = result.ToString();
263 }
264
265 } 217 }
266} 218}
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs
index 149a0ab..47d22b9 100644
--- a/OpenSim/Services/HypergridService/GatekeeperService.cs
+++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -370,8 +370,6 @@ namespace OpenSim.Services.HypergridService
370 return false; 370 return false;
371 } 371 }
372 } 372 }
373
374 return false;
375 } 373 }
376 374
377 // Check that the service token was generated for *this* grid. 375 // Check that the service token was generated for *this* grid.
diff --git a/OpenSim/Services/HypergridService/HGFriendsService.cs b/OpenSim/Services/HypergridService/HGFriendsService.cs
index 39524ab..98423d7 100644
--- a/OpenSim/Services/HypergridService/HGFriendsService.cs
+++ b/OpenSim/Services/HypergridService/HGFriendsService.cs
@@ -276,19 +276,19 @@ namespace OpenSim.Services.HypergridService
276 } 276 }
277 } 277 }
278 278
279 // Lastly, let's notify the rest who may be online somewhere else 279// // Lastly, let's notify the rest who may be online somewhere else
280 foreach (string user in usersToBeNotified) 280// foreach (string user in usersToBeNotified)
281 { 281// {
282 UUID id = new UUID(user); 282// UUID id = new UUID(user);
283 //m_UserAgentService.LocateUser(id); 283// //m_UserAgentService.LocateUser(id);
284 //etc... 284// //etc...
285 //if (m_TravelingAgents.ContainsKey(id) && m_TravelingAgents[id].GridExternalName != m_GridName) 285// //if (m_TravelingAgents.ContainsKey(id) && m_TravelingAgents[id].GridExternalName != m_GridName)
286 //{ 286// //{
287 // string url = m_TravelingAgents[id].GridExternalName; 287// // string url = m_TravelingAgents[id].GridExternalName;
288 // // forward 288// // // forward
289 //} 289// //}
290 //m_log.WarnFormat("[HGFRIENDS SERVICE]: User {0} is visiting another grid. HG Status notifications still not implemented.", user); 290// //m_log.WarnFormat("[HGFRIENDS SERVICE]: User {0} is visiting another grid. HG Status notifications still not implemented.", user);
291 } 291// }
292 292
293 // and finally, let's send the online friends 293 // and finally, let's send the online friends
294 if (online) 294 if (online)
diff --git a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
index 53fbea6..6e4b68c 100644
--- a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
+++ b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Services.HypergridService
57 private string m_HomeURL; 57 private string m_HomeURL;
58 private IUserAccountService m_UserAccountService; 58 private IUserAccountService m_UserAccountService;
59 59
60 private UserAccountCache m_Cache; 60// private UserAccountCache m_Cache;
61 61
62 private ExpiringCache<UUID, List<XInventoryFolder>> m_SuitcaseTrees = new ExpiringCache<UUID, List<XInventoryFolder>>(); 62 private ExpiringCache<UUID, List<XInventoryFolder>> m_SuitcaseTrees = new ExpiringCache<UUID, List<XInventoryFolder>>();
63 63
@@ -92,7 +92,7 @@ namespace OpenSim.Services.HypergridService
92 // Preferred 92 // Preferred
93 m_HomeURL = invConfig.GetString("HomeURI", m_HomeURL); 93 m_HomeURL = invConfig.GetString("HomeURI", m_HomeURL);
94 94
95 m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService); 95// m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService);
96 } 96 }
97 97
98 m_log.Debug("[HG SUITCASE INVENTORY SERVICE]: Starting..."); 98 m_log.Debug("[HG SUITCASE INVENTORY SERVICE]: Starting...");
diff --git a/OpenSim/Services/Interfaces/ISimulationService.cs b/OpenSim/Services/Interfaces/ISimulationService.cs
index d9f242b..a963b8e 100644
--- a/OpenSim/Services/Interfaces/ISimulationService.cs
+++ b/OpenSim/Services/Interfaces/ISimulationService.cs
@@ -118,16 +118,6 @@ namespace OpenSim.Services.Interfaces
118 /// <returns></returns> 118 /// <returns></returns>
119 bool CreateObject(GridRegion destination, Vector3 newPosition, ISceneObject sog, bool isLocalCall); 119 bool CreateObject(GridRegion destination, Vector3 newPosition, ISceneObject sog, bool isLocalCall);
120 120
121 /// <summary>
122 /// Create an object from the user's inventory in the destination region.
123 /// This message is used primarily by clients.
124 /// </summary>
125 /// <param name="regionHandle"></param>
126 /// <param name="userID"></param>
127 /// <param name="itemID"></param>
128 /// <returns></returns>
129 bool CreateObject(GridRegion destination, UUID userID, UUID itemID);
130
131 #endregion Objects 121 #endregion Objects
132 122
133 } 123 }