aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Environment/Interfaces/IEstateModule.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs8
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs9
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePhysicsJoint.cs1
4 files changed, 7 insertions, 13 deletions
diff --git a/OpenSim/Region/Environment/Interfaces/IEstateModule.cs b/OpenSim/Region/Environment/Interfaces/IEstateModule.cs
index 8e393bb..d84af20 100644
--- a/OpenSim/Region/Environment/Interfaces/IEstateModule.cs
+++ b/OpenSim/Region/Environment/Interfaces/IEstateModule.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Region.Environment.Interfaces
37 bool IsManager(UUID avatarID); 37 bool IsManager(UUID avatarID);
38 38
39 /// <summary> 39 /// <summary>
40 /// Tell all clients about the current state of the region (terrain textures, water height, etc.) 40 /// Tell all clients about the current state of the region (terrain textures, water height, etc.).
41 /// </summary> 41 /// </summary>
42 void sendRegionHandshakeToAll(); 42 void sendRegionHandshakeToAll();
43 } 43 }
diff --git a/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs b/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs
index 77aad6b..92c9463 100644
--- a/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs
+++ b/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs
@@ -191,7 +191,8 @@ namespace OpenSim.Region.Environment.Modules.Communications.REST
191 os.Close(); 191 os.Close();
192 //m_log.InfoFormat("[REST COMMS]: Posted ChildAgentUpdate request to remote sim {0}", uri); 192 //m_log.InfoFormat("[REST COMMS]: Posted ChildAgentUpdate request to remote sim {0}", uri);
193 } 193 }
194 catch (WebException ex) 194 //catch (WebException ex)
195 catch
195 { 196 {
196 //m_log.InfoFormat("[REST COMMS]: Bad send on ChildAgentUpdate {0}", ex.Message); 197 //m_log.InfoFormat("[REST COMMS]: Bad send on ChildAgentUpdate {0}", ex.Message);
197 198
@@ -200,7 +201,7 @@ namespace OpenSim.Region.Environment.Modules.Communications.REST
200 201
201 // Let's wait for the response 202 // Let's wait for the response
202 //m_log.Info("[REST COMMS]: Waiting for a reply after ChildAgentUpdate"); 203 //m_log.Info("[REST COMMS]: Waiting for a reply after ChildAgentUpdate");
203 string reply = null; 204
204 try 205 try
205 { 206 {
206 WebResponse webResponse = ChildUpdateRequest.GetResponse(); 207 WebResponse webResponse = ChildUpdateRequest.GetResponse();
@@ -210,7 +211,8 @@ namespace OpenSim.Region.Environment.Modules.Communications.REST
210 } 211 }
211 212
212 StreamReader sr = new StreamReader(webResponse.GetResponseStream()); 213 StreamReader sr = new StreamReader(webResponse.GetResponseStream());
213 reply = sr.ReadToEnd().Trim(); 214 //reply = sr.ReadToEnd().Trim();
215 sr.ReadToEnd().Trim();
214 sr.Close(); 216 sr.Close();
215 //m_log.InfoFormat("[REST COMMS]: ChilAgentUpdate reply was {0} ", reply); 217 //m_log.InfoFormat("[REST COMMS]: ChilAgentUpdate reply was {0} ", reply);
216 218
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 1f671ab..1e26c91 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -1800,8 +1800,6 @@ namespace OpenSim.Region.Environment.Scenes
1800 1800
1801 string sceneObjectXml = objectGroup.ToXmlString(); 1801 string sceneObjectXml = objectGroup.ToXmlString();
1802 1802
1803 bool useOwner = false;
1804
1805 // Get the user info of the item destination 1803 // Get the user info of the item destination
1806 // 1804 //
1807 CachedUserInfo userInfo; 1805 CachedUserInfo userInfo;
@@ -1849,13 +1847,8 @@ namespace OpenSim.Region.Environment.Scenes
1849 // 1847 //
1850 1848
1851 InventoryFolderBase folder = null; 1849 InventoryFolderBase folder = null;
1852 InventoryItemBase item = null; 1850 InventoryItemBase item = null;
1853
1854 1851
1855 // No folder type needed
1856 // We don't go here unless we have a user logged in
1857 // so the skeleton is loaded
1858 //
1859 if (DeRezAction.SaveToExistingUserInventoryItem == action) 1852 if (DeRezAction.SaveToExistingUserInventoryItem == action)
1860 { 1853 {
1861 item = userInfo.RootFolder.FindItem( 1854 item = userInfo.RootFolder.FindItem(
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePhysicsJoint.cs b/OpenSim/Region/Physics/OdePlugin/OdePhysicsJoint.cs
index 9858d6a..8180497 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePhysicsJoint.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePhysicsJoint.cs
@@ -30,7 +30,6 @@ using OpenMetaverse;
30using Ode.NET; 30using Ode.NET;
31using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenSim.Region.Physics.Manager; 32using OpenSim.Region.Physics.Manager;
33using OpenSim.Region.Physics.Manager;
34using OpenSim.Region.Physics.OdePlugin; 33using OpenSim.Region.Physics.OdePlugin;
35 34
36namespace OpenSim.Region.Physics.OdePlugin 35namespace OpenSim.Region.Physics.OdePlugin