aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs2
-rw-r--r--OpenSim/Framework/Servers/CheckSumServer.cs4
-rw-r--r--OpenSim/Region/ClientStack/PacketQueue.cs2
-rw-r--r--OpenSim/Region/Communications/Local/LocalBackEndServices.cs23
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs10
-rw-r--r--OpenSim/Region/Environment/Modules/ChatModule.cs6
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs8
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs12
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneManager.cs5
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs3
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs6
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs8
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsScene.cs2
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODECharacter.cs8
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODEPrim.cs22
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs21
18 files changed, 54 insertions, 96 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index b9559c0..835385d 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -32,7 +32,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
32 { 32 {
33 if (openSim.ConfigSource.Configs["RemoteAdmin"].GetBoolean("enabled", false)) 33 if (openSim.ConfigSource.Configs["RemoteAdmin"].GetBoolean("enabled", false))
34 { 34 {
35 OpenSim.Framework.Console.MainLog.Instance.Verbose("RADMIN", "Remote Admin Plugin Enabled"); 35 MainLog.Instance.Verbose("RADMIN", "Remote Admin Plugin Enabled");
36 36
37 m_app = openSim; 37 m_app = openSim;
38 m_httpd = openSim.HttpServer; 38 m_httpd = openSim.HttpServer;
diff --git a/OpenSim/Framework/Servers/CheckSumServer.cs b/OpenSim/Framework/Servers/CheckSumServer.cs
index 854c836..c92cd13 100644
--- a/OpenSim/Framework/Servers/CheckSumServer.cs
+++ b/OpenSim/Framework/Servers/CheckSumServer.cs
@@ -25,6 +25,7 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28
28namespace OpenSim.Framework.Servers 29namespace OpenSim.Framework.Servers
29{ 30{
30 /* 31 /*
@@ -113,8 +114,7 @@ namespace OpenSim.Framework.Servers
113 } 114 }
114 catch (Exception) 115 catch (Exception)
115 { 116 {
116 OpenSim.Framework.Console.MainLog.Instance.Warn("CheckSumServer.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection "); 117 MainLog.Instance.Warn("CheckSumServer.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection ");
117
118 } 118 }
119 } 119 }
120 120
diff --git a/OpenSim/Region/ClientStack/PacketQueue.cs b/OpenSim/Region/ClientStack/PacketQueue.cs
index 7991c7d..6dfa15c 100644
--- a/OpenSim/Region/ClientStack/PacketQueue.cs
+++ b/OpenSim/Region/ClientStack/PacketQueue.cs
@@ -321,7 +321,7 @@ namespace OpenSim.Region.ClientStack
321 321
322 tall = tResend + tLand + tWind + tCloud + tTask + tTexture + tAsset; 322 tall = tResend + tLand + tWind + tCloud + tTask + tTexture + tAsset;
323 /* 323 /*
324 OpenSim.Framework.Console.MainLog.Instance.Verbose("CLIENT", "Client AgentThrottle - Got throttle:resendbytes=" + tResend + 324 MainLog.Instance.Verbose("CLIENT", "Client AgentThrottle - Got throttle:resendbytes=" + tResend +
325 " landbytes=" + tLand + 325 " landbytes=" + tLand +
326 " windbytes=" + tWind + 326 " windbytes=" + tWind +
327 " cloudbytes=" + tCloud + 327 " cloudbytes=" + tCloud +
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
index 91b6c1f..9d390e4 100644
--- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -29,6 +29,7 @@ using System.Collections;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using libsecondlife; 30using libsecondlife;
31using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenSim.Framework.Console;
32using OpenSim.Framework.Communications; 33using OpenSim.Framework.Communications;
33 34
34namespace OpenSim.Region.Communications.Local 35namespace OpenSim.Region.Communications.Local
@@ -50,7 +51,6 @@ namespace OpenSim.Region.Communications.Local
50 set 51 set
51 { 52 {
52 _gdebugRegionName = value; 53 _gdebugRegionName = value;
53
54 } 54 }
55 } 55 }
56 public string _rdebugRegionName = ""; 56 public string _rdebugRegionName = "";
@@ -61,7 +61,6 @@ namespace OpenSim.Region.Communications.Local
61 set 61 set
62 { 62 {
63 _rdebugRegionName = value; 63 _rdebugRegionName = value;
64
65 } 64 }
66 } 65 }
67 public LocalBackEndServices() 66 public LocalBackEndServices()
@@ -84,7 +83,7 @@ namespace OpenSim.Region.Communications.Local
84 RegionCommsListener regionHost = new RegionCommsListener(); 83 RegionCommsListener regionHost = new RegionCommsListener();
85 if (m_regionListeners.ContainsKey(regionInfo.RegionHandle)) 84 if (m_regionListeners.ContainsKey(regionInfo.RegionHandle))
86 { 85 {
87 OpenSim.Framework.Console.MainLog.Instance.Error("INTERREGION", "Error:Region registered twice as an Events listener for Interregion Communications but not as a listed region. In Standalone mode this will cause BIG issues. In grid mode, it means a region went down and came back up."); 86 MainLog.Instance.Error("INTERREGION", "Error:Region registered twice as an Events listener for Interregion Communications but not as a listed region. In Standalone mode this will cause BIG issues. In grid mode, it means a region went down and came back up.");
88 m_regionListeners.Remove(regionInfo.RegionHandle); 87 m_regionListeners.Remove(regionInfo.RegionHandle);
89 } 88 }
90 m_regionListeners.Add(regionInfo.RegionHandle, regionHost); 89 m_regionListeners.Add(regionInfo.RegionHandle, regionHost);
@@ -95,7 +94,7 @@ namespace OpenSim.Region.Communications.Local
95 { 94 {
96 // Already in our list, so the region went dead and restarted. 95 // Already in our list, so the region went dead and restarted.
97 m_regions.Remove(regionInfo.RegionHandle); 96 m_regions.Remove(regionInfo.RegionHandle);
98 OpenSim.Framework.Console.MainLog.Instance.Warn("INTERREGION", "Region registered twice. Region went down and came back up."); 97 MainLog.Instance.Warn("INTERREGION", "Region registered twice. Region went down and came back up.");
99 98
100 RegionCommsListener regionHost = new RegionCommsListener(); 99 RegionCommsListener regionHost = new RegionCommsListener();
101 if (m_regionListeners.ContainsKey(regionInfo.RegionHandle)) 100 if (m_regionListeners.ContainsKey(regionInfo.RegionHandle))
@@ -208,7 +207,6 @@ namespace OpenSim.Region.Communications.Local
208 207
209 public bool TriggerRegionUp(RegionInfo region, ulong regionhandle) 208 public bool TriggerRegionUp(RegionInfo region, ulong regionhandle)
210 { 209 {
211
212 if (m_regionListeners.ContainsKey(regionhandle)) 210 if (m_regionListeners.ContainsKey(regionhandle))
213 { 211 {
214 return m_regionListeners[regionhandle].TriggerRegionUp(region); 212 return m_regionListeners[regionhandle].TriggerRegionUp(region);
@@ -227,13 +225,13 @@ namespace OpenSim.Region.Communications.Local
227 //should change from agentCircuitData 225 //should change from agentCircuitData
228 { 226 {
229 //Console.WriteLine("CommsManager- Trying to Inform a region to expect child agent"); 227 //Console.WriteLine("CommsManager- Trying to Inform a region to expect child agent");
230 //OpenSim.Framework.Console.MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: Trying to inform region of child agent: " + agentData.firstname + " " + agentData.lastname); 228 //MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: Trying to inform region of child agent: " + agentData.firstname + " " + agentData.lastname);
231 229
232 if (m_regionListeners.ContainsKey(regionHandle)) 230 if (m_regionListeners.ContainsKey(regionHandle))
233 { 231 {
234 // Console.WriteLine("CommsManager- Informing a region to expect child agent"); 232 // Console.WriteLine("CommsManager- Informing a region to expect child agent");
235 m_regionListeners[regionHandle].TriggerExpectUser(regionHandle, agentData); 233 m_regionListeners[regionHandle].TriggerExpectUser(regionHandle, agentData);
236 //OpenSim.Framework.Console.MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: Got Listener trigginering local event: " + agentData.firstname + " " + agentData.lastname); 234 //MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: Got Listener trigginering local event: " + agentData.firstname + " " + agentData.lastname);
237 235
238 return true; 236 return true;
239 } 237 }
@@ -327,11 +325,11 @@ namespace OpenSim.Region.Communications.Local
327 325
328 public void TriggerExpectUser(ulong regionHandle, AgentCircuitData agent) 326 public void TriggerExpectUser(ulong regionHandle, AgentCircuitData agent)
329 { 327 {
330 //OpenSim.Framework.Console.MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: Other region is sending child agent our way: " + agent.firstname + " " + agent.lastname); 328 //MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: Other region is sending child agent our way: " + agent.firstname + " " + agent.lastname);
331 329
332 if (m_regionListeners.ContainsKey(regionHandle)) 330 if (m_regionListeners.ContainsKey(regionHandle))
333 { 331 {
334 //OpenSim.Framework.Console.MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: FoundLocalRegion To send it to: " + agent.firstname + " " + agent.lastname); 332 //MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: FoundLocalRegion To send it to: " + agent.firstname + " " + agent.lastname);
335 333
336 m_regionListeners[regionHandle].TriggerExpectUser(regionHandle, agent); 334 m_regionListeners[regionHandle].TriggerExpectUser(regionHandle, agent);
337 } 335 }
@@ -343,7 +341,6 @@ namespace OpenSim.Region.Communications.Local
343 { 341 {
344 m_regionListeners[regionHandle].TriggerExpectPrim(regionHandle, primID, objData); 342 m_regionListeners[regionHandle].TriggerExpectPrim(regionHandle, primID, objData);
345 } 343 }
346
347 } 344 }
348 345
349 public void PingCheckReply(Hashtable respData) 346 public void PingCheckReply(Hashtable respData)
@@ -381,11 +378,11 @@ namespace OpenSim.Region.Communications.Local
381 378
382 public bool IncomingChildAgent(ulong regionHandle, AgentCircuitData agentData) 379 public bool IncomingChildAgent(ulong regionHandle, AgentCircuitData agentData)
383 { 380 {
384 // OpenSim.Framework.Console.MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: Other local region is sending child agent our way: " + agentData.firstname + " " + agentData.lastname); 381 // MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: Other local region is sending child agent our way: " + agentData.firstname + " " + agentData.lastname);
385 382
386 if (m_regionListeners.ContainsKey(regionHandle)) 383 if (m_regionListeners.ContainsKey(regionHandle))
387 { 384 {
388 //OpenSim.Framework.Console.MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: found local region to trigger event on: " + agentData.firstname + " " + agentData.lastname); 385 //MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: found local region to trigger event on: " + agentData.firstname + " " + agentData.lastname);
389 386
390 TriggerExpectUser(regionHandle, agentData); 387 TriggerExpectUser(regionHandle, agentData);
391 return true; 388 return true;
@@ -394,4 +391,4 @@ namespace OpenSim.Region.Communications.Local
394 return false; 391 return false;
395 } 392 }
396 } 393 }
397} \ No newline at end of file 394}
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index ed77e20..d26da90 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -50,8 +50,8 @@ namespace OpenSim.Region.Communications.OGS1
50 { 50 {
51 if (data.Contains("error_type")) 51 if (data.Contains("error_type"))
52 { 52 {
53 OpenSim.Framework.Console.MainLog.Instance.Warn("GRID", "Error sent by user server when trying to get user profile: (" + data["error_type"] + 53 MainLog.Instance.Warn("GRID", "Error sent by user server when trying to get user profile: (" + data["error_type"] +
54 "): " + data["error_desc"]); 54 "): " + data["error_desc"]);
55 return null; 55 return null;
56 } 56 }
57 57
@@ -104,16 +104,13 @@ namespace OpenSim.Region.Communications.OGS1
104 MainLog.Instance.Warn("INTERGRID", "Got invalid queryID from userServer"); 104 MainLog.Instance.Warn("INTERGRID", "Got invalid queryID from userServer");
105 } 105 }
106 return pickerlist; 106 return pickerlist;
107
108 } 107 }
109 108
110
111 public UserProfileData GetUserProfile(string firstName, string lastName) 109 public UserProfileData GetUserProfile(string firstName, string lastName)
112 { 110 {
113 return GetUserProfile(firstName + " " + lastName); 111 return GetUserProfile(firstName + " " + lastName);
114 } 112 }
115 113
116
117 public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(LLUUID queryID, string query) 114 public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(LLUUID queryID, string query)
118 { 115 {
119 List<AvatarPickerAvatar> pickerlist = new List<AvatarPickerAvatar>(); 116 List<AvatarPickerAvatar> pickerlist = new List<AvatarPickerAvatar>();
@@ -138,6 +135,7 @@ namespace OpenSim.Region.Communications.OGS1
138 } 135 }
139 return pickerlist; 136 return pickerlist;
140 } 137 }
138
141 public UserProfileData GetUserProfile(string name) 139 public UserProfileData GetUserProfile(string name)
142 { 140 {
143 try 141 try
@@ -213,4 +211,4 @@ namespace OpenSim.Region.Communications.OGS1
213 throw new Exception("The method or operation is not implemented."); 211 throw new Exception("The method or operation is not implemented.");
214 } 212 }
215 } 213 }
216} \ No newline at end of file 214}
diff --git a/OpenSim/Region/Environment/Modules/ChatModule.cs b/OpenSim/Region/Environment/Modules/ChatModule.cs
index 924972b..be38baf 100644
--- a/OpenSim/Region/Environment/Modules/ChatModule.cs
+++ b/OpenSim/Region/Environment/Modules/ChatModule.cs
@@ -259,7 +259,6 @@ namespace OpenSim.Region.Environment.Modules
259 } 259 }
260 } 260 }
261 } 261 }
262
263 } 262 }
264 } 263 }
265 264
@@ -306,7 +305,7 @@ namespace OpenSim.Region.Environment.Modules
306 } 305 }
307 catch (Exception) 306 catch (Exception)
308 { 307 {
309 OpenSim.Framework.Console.MainLog.Instance.Verbose("CHAT", "No IRC config information, skipping IRC bridge configuration"); 308 MainLog.Instance.Verbose("CHAT", "No IRC config information, skipping IRC bridge configuration");
310 } 309 }
311 m_log = MainLog.Instance; 310 m_log = MainLog.Instance;
312 } 311 }
@@ -442,7 +441,6 @@ namespace OpenSim.Region.Environment.Modules
442 } 441 }
443 } 442 }
444 443
445
446 public void Close() 444 public void Close()
447 { 445 {
448 listener.Abort(); 446 listener.Abort();
@@ -452,4 +450,4 @@ namespace OpenSim.Region.Environment.Modules
452 m_tcp.Close(); 450 m_tcp.Close();
453 } 451 }
454 } 452 }
455} \ No newline at end of file 453}
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 290629c..2511baf 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -662,7 +662,7 @@ namespace OpenSim.Region.Environment.Scenes
662 /// <param name="prims"></param> 662 /// <param name="prims"></param>
663 public void DelinkObjects(List<uint> primIds) 663 public void DelinkObjects(List<uint> primIds)
664 { 664 {
665 //OpenSim.Framework.Console.MainLog.Instance.Verbose("DelinkObjects()"); 665 //MainLog.Instance.Verbose("DelinkObjects()");
666 666
667 SceneObjectGroup parenPrim = null; 667 SceneObjectGroup parenPrim = null;
668 668
@@ -700,7 +700,7 @@ namespace OpenSim.Region.Environment.Scenes
700 } 700 }
701 else 701 else
702 { 702 {
703 OpenSim.Framework.Console.MainLog.Instance.Verbose("SCENE", 703 MainLog.Instance.Verbose("SCENE",
704 "DelinkObjects(): Could not find a root prim out of {0} as given to a delink request!", 704 "DelinkObjects(): Could not find a root prim out of {0} as given to a delink request!",
705 primIds); 705 primIds);
706 } 706 }
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 5976fdc..f518d63 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -153,7 +153,7 @@ namespace OpenSim.Region.Environment.Scenes
153 } 153 }
154 else 154 else
155 { 155 {
156 OpenSim.Framework.Console.MainLog.Instance.Warn( 156 MainLog.Instance.Warn(
157 "Asset ID " + item.assetID + " not found for item ID " + itemID 157 "Asset ID " + item.assetID + " not found for item ID " + itemID
158 + " named " + item.inventoryName + " for an inventory item update."); 158 + " named " + item.inventoryName + " for an inventory item update.");
159 return; 159 return;
@@ -199,13 +199,13 @@ namespace OpenSim.Region.Environment.Scenes
199 } 199 }
200 else 200 else
201 { 201 {
202 OpenSim.Framework.Console.MainLog.Instance.Warn( 202 MainLog.Instance.Warn(
203 "Item ID " + itemID + " not found for an inventory item update."); 203 "Item ID " + itemID + " not found for an inventory item update.");
204 } 204 }
205 } 205 }
206 else 206 else
207 { 207 {
208 OpenSim.Framework.Console.MainLog.Instance.Warn( 208 MainLog.Instance.Warn(
209 "Agent ID " + remoteClient.AgentId + " not found for an inventory item update."); 209 "Agent ID " + remoteClient.AgentId + " not found for an inventory item update.");
210 } 210 }
211 } 211 }
@@ -439,7 +439,7 @@ namespace OpenSim.Region.Environment.Scenes
439 foreach (DeRezObjectPacket.ObjectDataBlock Data in DeRezPacket.ObjectData) 439 foreach (DeRezObjectPacket.ObjectDataBlock Data in DeRezPacket.ObjectData)
440 { 440 {
441 EntityBase selectedEnt = null; 441 EntityBase selectedEnt = null;
442 //OpenSim.Framework.Console.MainConsole.Instance.WriteLine("LocalID:" + Data.ObjectLocalID.ToString()); 442 //MainLog.Instance.Verbose("LocalID:" + Data.ObjectLocalID.ToString());
443 foreach (EntityBase ent in Entities.Values) 443 foreach (EntityBase ent in Entities.Values)
444 { 444 {
445 if (ent.LocalId == Data.ObjectLocalID) 445 if (ent.LocalId == Data.ObjectLocalID)
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index 0923010..04228de 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -7,7 +7,6 @@ using OpenSim.Framework;
7using OpenSim.Framework.Console; 7using OpenSim.Framework.Console;
8using OpenSim.Framework.Communications; 8using OpenSim.Framework.Communications;
9 9
10
11namespace OpenSim.Region.Environment.Scenes 10namespace OpenSim.Region.Environment.Scenes
12{ 11{
13 public delegate void KillObjectDelegate(uint localID); 12 public delegate void KillObjectDelegate(uint localID);
@@ -28,16 +27,12 @@ namespace OpenSim.Region.Environment.Scenes
28 public KillObjectDelegate KillObject; 27 public KillObjectDelegate KillObject;
29 public string _debugRegionName = ""; 28 public string _debugRegionName = "";
30 29
31
32 public string debugRegionName 30 public string debugRegionName
33 { 31 {
34 get { return _debugRegionName; } 32 get { return _debugRegionName; }
35 set 33 set
36 { 34 {
37 _debugRegionName = value; 35 _debugRegionName = value;
38
39
40
41 } 36 }
42 } 37 }
43 38
@@ -64,13 +59,10 @@ namespace OpenSim.Region.Environment.Scenes
64 regionCommsHost.OnPrimCrossingIntoRegion += PrimCrossing; 59 regionCommsHost.OnPrimCrossingIntoRegion += PrimCrossing;
65 regionCommsHost.OnCloseAgentConnection += CloseConnection; 60 regionCommsHost.OnCloseAgentConnection += CloseConnection;
66 regionCommsHost.OnRegionUp += newRegionUp; 61 regionCommsHost.OnRegionUp += newRegionUp;
67
68
69 } 62 }
70 else 63 else
71 { 64 {
72 //MainLog.Instance.Verbose("INTER", debugRegionName + ": SceneCommunicationService: registered with gridservice and got null"); 65 //MainLog.Instance.Verbose("INTER", debugRegionName + ": SceneCommunicationService: registered with gridservice and got null");
73
74 } 66 }
75 } 67 }
76 68
@@ -360,8 +352,6 @@ namespace OpenSim.Region.Environment.Scenes
360 return m_commsProvider.InterRegion.ExpectAvatarCrossing(regionhandle, agentID, position, isFlying); 352 return m_commsProvider.InterRegion.ExpectAvatarCrossing(regionhandle, agentID, position, isFlying);
361 } 353 }
362 354
363
364
365 public bool PrimCrossToNeighboringRegion(ulong regionhandle, LLUUID primID, LLVector3 position, bool isPhysical) 355 public bool PrimCrossToNeighboringRegion(ulong regionhandle, LLUUID primID, LLVector3 position, bool isPhysical)
366 { 356 {
367 return m_commsProvider.InterRegion.ExpectPrimCrossing(regionhandle, primID, position, isPhysical); 357 return m_commsProvider.InterRegion.ExpectPrimCrossing(regionhandle, primID, position, isPhysical);
@@ -371,11 +361,9 @@ namespace OpenSim.Region.Environment.Scenes
371 { 361 {
372 foreach (ulong regionHandle in presence.KnownChildRegions) 362 foreach (ulong regionHandle in presence.KnownChildRegions)
373 { 363 {
374
375 m_commsProvider.InterRegion.TellRegionToCloseChildConnection(regionHandle, presence.ControllingClient.AgentId); 364 m_commsProvider.InterRegion.TellRegionToCloseChildConnection(regionHandle, presence.ControllingClient.AgentId);
376 presence.RemoveNeighbourRegion(regionHandle); 365 presence.RemoveNeighbourRegion(regionHandle);
377 } 366 }
378 } 367 }
379 } 368 }
380} 369}
381
diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Environment/Scenes/SceneManager.cs
index 347091f..2af9af2 100644
--- a/OpenSim/Region/Environment/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneManager.cs
@@ -95,7 +95,6 @@ namespace OpenSim.Region.Environment.Scenes
95 { 95 {
96 scene.OnRestart += HandleRestart; 96 scene.OnRestart += HandleRestart;
97 m_localScenes.Add(scene); 97 m_localScenes.Add(scene);
98
99 } 98 }
100 99
101 public void HandleRestart(RegionInfo rdata) 100 public void HandleRestart(RegionInfo rdata)
@@ -155,6 +154,7 @@ namespace OpenSim.Region.Environment.Scenes
155 MainLog.Instance.Error("REGION", "Unable to notify Other regions of this Region coming up"); 154 MainLog.Instance.Error("REGION", "Unable to notify Other regions of this Region coming up");
156 } 155 }
157 } 156 }
157
158 public void SaveCurrentSceneToXml(string filename) 158 public void SaveCurrentSceneToXml(string filename)
159 { 159 {
160 CurrentOrFirstScene.SavePrimsToXml(filename); 160 CurrentOrFirstScene.SavePrimsToXml(filename);
@@ -291,7 +291,6 @@ namespace OpenSim.Region.Environment.Scenes
291 return false; 291 return false;
292 } 292 }
293 293
294
295 public void SetDebugPacketOnCurrentScene(LogBase log, int newDebug) 294 public void SetDebugPacketOnCurrentScene(LogBase log, int newDebug)
296 { 295 {
297 ForEachCurrentScene(delegate(Scene scene) 296 ForEachCurrentScene(delegate(Scene scene)
@@ -360,7 +359,6 @@ namespace OpenSim.Region.Environment.Scenes
360 }); 359 });
361 } 360 }
362 361
363
364 public void ForceCurrentSceneClientUpdate() 362 public void ForceCurrentSceneClientUpdate()
365 { 363 {
366 ForEachCurrentScene(delegate(Scene scene) { scene.ForceClientUpdate(); }); 364 ForEachCurrentScene(delegate(Scene scene) { scene.ForceClientUpdate(); });
@@ -401,7 +399,6 @@ namespace OpenSim.Region.Environment.Scenes
401 return false; 399 return false;
402 } 400 }
403 401
404
405 public void CloseScene(Scene scene) 402 public void CloseScene(Scene scene)
406 { 403 {
407 m_localScenes.Remove(scene); 404 m_localScenes.Remove(scene);
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index e82c38c..fe135de 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -35,6 +35,7 @@ using Axiom.Math;
35using libsecondlife; 35using libsecondlife;
36using libsecondlife.Packets; 36using libsecondlife.Packets;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Console;
38using OpenSim.Region.Environment.Interfaces; 39using OpenSim.Region.Environment.Interfaces;
39using OpenSim.Region.Physics.Manager; 40using OpenSim.Region.Physics.Manager;
40using System.Drawing; 41using System.Drawing;
@@ -951,7 +952,7 @@ namespace OpenSim.Region.Environment.Scenes
951 } 952 }
952 else 953 else
953 { 954 {
954 OpenSim.Framework.Console.MainLog.Instance.Verbose("SCENE", 955 MainLog.Instance.Verbose("SCENE",
955 "DelinkFromGroup(): Child prim local id {0} not found in object with root prim id {1}", 956 "DelinkFromGroup(): Child prim local id {0} not found in object with root prim id {1}",
956 partID, LocalId); 957 partID, LocalId);
957 } 958 }
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index a60e3b5..12d5bdb 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -34,6 +34,7 @@ using Axiom.Math;
34using libsecondlife; 34using libsecondlife;
35using libsecondlife.Packets; 35using libsecondlife.Packets;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.Console;
37using OpenSim.Region.Environment.Interfaces; 38using OpenSim.Region.Environment.Interfaces;
38using OpenSim.Region.Environment.Scenes.Scripting; 39using OpenSim.Region.Environment.Scenes.Scripting;
39using OpenSim.Region.Physics.Manager; 40using OpenSim.Region.Physics.Manager;
@@ -1392,15 +1393,12 @@ namespace OpenSim.Region.Environment.Scenes
1392 1393
1393 public void PhysicsOutOfBounds(PhysicsVector pos) 1394 public void PhysicsOutOfBounds(PhysicsVector pos)
1394 { 1395 {
1395 OpenSim.Framework.Console.MainLog.Instance.Verbose("PHYSICS", "Physical Object went out of bounds."); 1396 MainLog.Instance.Verbose("PHYSICS", "Physical Object went out of bounds.");
1396 RemFlag(LLObject.ObjectFlags.Physics); 1397 RemFlag(LLObject.ObjectFlags.Physics);
1397 DoPhysicsPropertyUpdate(false, true); 1398 DoPhysicsPropertyUpdate(false, true);
1398 m_parentGroup.m_scene.PhysicsScene.AddPhysicsActorTaint(PhysActor); 1399 m_parentGroup.m_scene.PhysicsScene.AddPhysicsActorTaint(PhysActor);
1399
1400
1401 } 1400 }
1402 1401
1403
1404 public virtual void OnGrab(LLVector3 offsetPos, IClientAPI remoteClient) 1402 public virtual void OnGrab(LLVector3 offsetPos, IClientAPI remoteClient)
1405 { 1403 {
1406 } 1404 }
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
index 5de816f..c1e4805 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Region.Environment.Scenes
44 44
45 public void LoadAnims() 45 public void LoadAnims()
46 { 46 {
47 //OpenSim.Framework.Console.MainLog.Instance.Verbose("ScenePresence.Animations.cs:LoadAnims() - Loading avatar animations"); 47 //MainLog.Instance.Verbose("ScenePresence.Animations.cs:LoadAnims() - Loading avatar animations");
48 using (XmlTextReader reader = new XmlTextReader("data/avataranimations.xml")) 48 using (XmlTextReader reader = new XmlTextReader("data/avataranimations.xml"))
49 { 49 {
50 XmlDocument doc = new XmlDocument(); 50 XmlDocument doc = new XmlDocument();
@@ -58,7 +58,7 @@ namespace OpenSim.Region.Environment.Scenes
58 } 58 }
59 } 59 }
60 60
61 // OpenSim.Framework.Console.MainLog.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)"); 61 // MainLog.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
62 62
63 foreach (KeyValuePair<string, LLUUID> kp in Animations.AnimsLLUUID) 63 foreach (KeyValuePair<string, LLUUID> kp in Animations.AnimsLLUUID)
64 { 64 {
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index abfa250..524fb60 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -36,7 +36,6 @@ using OpenSim.Framework.Communications;
36using OpenSim.Region.Environment.Types; 36using OpenSim.Region.Environment.Types;
37using OpenSim.Region.Physics.Manager; 37using OpenSim.Region.Physics.Manager;
38 38
39
40namespace OpenSim.Region.Environment.Scenes 39namespace OpenSim.Region.Environment.Scenes
41{ 40{
42 public partial class ScenePresence : EntityBase 41 public partial class ScenePresence : EntityBase
@@ -512,7 +511,7 @@ namespace OpenSim.Region.Environment.Scenes
512 for (int i = 0; i < visualParam.Length; i++) 511 for (int i = 0; i < visualParam.Length; i++)
513 { 512 {
514 m_visualParams[i] = visualParam[i].ParamValue; 513 m_visualParams[i] = visualParam[i].ParamValue;
515 //OpenSim.Framework.Console.MainLog.Instance.Verbose("CLIENT", "VisualData[" + i.ToString() + "]: " + visualParam[i].ParamValue.ToString() + "m"); 514 //MainLog.Instance.Verbose("CLIENT", "VisualData[" + i.ToString() + "]: " + visualParam[i].ParamValue.ToString() + "m");
516 } 515 }
517 516
518 // Teravus : Nifty AV Height Getting Maaaaagical formula. Oh how we love turning 0-255 into meters. 517 // Teravus : Nifty AV Height Getting Maaaaagical formula. Oh how we love turning 0-255 into meters.
@@ -525,7 +524,7 @@ namespace OpenSim.Region.Environment.Scenes
525 PhysicsVector SetSize = new PhysicsVector(0.45f, 0.6f, m_avHeight); 524 PhysicsVector SetSize = new PhysicsVector(0.45f, 0.6f, m_avHeight);
526 PhysicsActor.Size = SetSize; 525 PhysicsActor.Size = SetSize;
527 } 526 }
528 //OpenSim.Framework.Console.MainLog.Instance.Verbose("CLIENT", "Set Avatar Height to: " + (1.50856f + (((float)m_visualParams[25] / 255.0f) * (2.525506f - 1.50856f))).ToString() + "m" + " Leglength: " + ((float)m_visualParams[125]).ToString() + ":" + (((float)m_visualParams[125] / 255.0f)).ToString() + "m"); 527 //MainLog.Instance.Verbose("CLIENT", "Set Avatar Height to: " + (1.50856f + (((float)m_visualParams[25] / 255.0f) * (2.525506f - 1.50856f))).ToString() + "m" + " Leglength: " + ((float)m_visualParams[125]).ToString() + ":" + (((float)m_visualParams[125] / 255.0f)).ToString() + "m");
529 SendAppearanceToAllOtherAgents(); 528 SendAppearanceToAllOtherAgents();
530 } 529 }
531 530
@@ -675,7 +674,6 @@ namespace OpenSim.Region.Environment.Scenes
675 UpdateMovementAnimations(update_movementflag); 674 UpdateMovementAnimations(update_movementflag);
676 } 675 }
677 } 676 }
678
679 } 677 }
680 678
681 /// <summary> 679 /// <summary>
@@ -781,7 +779,6 @@ namespace OpenSim.Region.Environment.Scenes
781 { 779 {
782 PhysicsActor.SetAlwaysRun = SetAlwaysRun; 780 PhysicsActor.SetAlwaysRun = SetAlwaysRun;
783 } 781 }
784
785 } 782 }
786 783
787 protected void UpdateMovementAnimations(bool update_movementflag) 784 protected void UpdateMovementAnimations(bool update_movementflag)
@@ -1020,7 +1017,6 @@ namespace OpenSim.Region.Environment.Scenes
1020 m_newCoarseLocations = true; 1017 m_newCoarseLocations = true;
1021 } 1018 }
1022 1019
1023
1024 /// <summary> 1020 /// <summary>
1025 /// 1021 ///
1026 /// </summary> 1022 /// </summary>
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 56a1842..5de22e7 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -130,7 +130,7 @@ namespace OpenSim.Region.Physics.Manager
130 { 130 {
131 m_workIndicator = (m_workIndicator + 1)%10; 131 m_workIndicator = (m_workIndicator + 1)%10;
132 132
133 //OpenSim.Framework.Console.MainLog.Instance.SetStatus(m_workIndicator.ToString()); 133 //MainLog.Instance.SetStatus(m_workIndicator.ToString());
134 } 134 }
135 135
136 public override void GetResults() 136 public override void GetResults()
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index 1e15f5e..91e44f3 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
3using Axiom.Math; 3using Axiom.Math;
4using Ode.NET; 4using Ode.NET;
5using OpenSim.Framework; 5using OpenSim.Framework;
6using OpenSim.Framework.Console;
6using OpenSim.Region.Physics.Manager; 7using OpenSim.Region.Physics.Manager;
7 8
8namespace OpenSim.Region.Physics.OdePlugin 9namespace OpenSim.Region.Physics.OdePlugin
@@ -229,7 +230,7 @@ namespace OpenSim.Region.Physics.OdePlugin
229 CAPSULE_LENGTH = (SetSize.Z - ((SetSize.Z * 0.43f))); // subtract 43% of the size 230 CAPSULE_LENGTH = (SetSize.Z - ((SetSize.Z * 0.43f))); // subtract 43% of the size
230 d.BodyDestroy(Body); 231 d.BodyDestroy(Body);
231 d.GeomDestroy(Shell); 232 d.GeomDestroy(Shell);
232 //OpenSim.Framework.Console.MainLog.Instance.Verbose("PHYSICS", "Set Avatar Height To: " + (CAPSULE_RADIUS + CAPSULE_LENGTH)); 233 //MainLog.Instance.Verbose("PHYSICS", "Set Avatar Height To: " + (CAPSULE_RADIUS + CAPSULE_LENGTH));
233 Shell = d.CreateCapsule(_parent_scene.space, capsuleradius, CAPSULE_LENGTH); 234 Shell = d.CreateCapsule(_parent_scene.space, capsuleradius, CAPSULE_LENGTH);
234 d.MassSetCapsule(out ShellMass, 50.0f, 3, CAPSULE_RADIUS, CAPSULE_LENGTH); 235 d.MassSetCapsule(out ShellMass, 50.0f, 3, CAPSULE_RADIUS, CAPSULE_LENGTH);
235 Body = d.BodyCreate(_parent_scene.world); 236 Body = d.BodyCreate(_parent_scene.world);
@@ -428,13 +429,12 @@ namespace OpenSim.Region.Physics.OdePlugin
428 int[] arrayitem = _parent_scene.calculateSpaceArrayItemFromPos(_position); 429 int[] arrayitem = _parent_scene.calculateSpaceArrayItemFromPos(_position);
429 if (primScenAvatarIn == "0") 430 if (primScenAvatarIn == "0")
430 { 431 {
431 OpenSim.Framework.Console.MainLog.Instance.Verbose("Physics", "Avatar " + m_name + " in space with no prim. Arr:':" + arrayitem[0].ToString() + "," + arrayitem[1].ToString()); 432 MainLog.Instance.Verbose("Physics", "Avatar " + m_name + " in space with no prim. Arr:':" + arrayitem[0].ToString() + "," + arrayitem[1].ToString());
432 } 433 }
433 else 434 else
434 { 435 {
435 OpenSim.Framework.Console.MainLog.Instance.Verbose("Physics", "Avatar " + m_name + " in Prim space':" + primScenAvatarIn + ". Arr:" + arrayitem[0].ToString() + "," + arrayitem[1].ToString()); 436 MainLog.Instance.Verbose("Physics", "Avatar " + m_name + " in Prim space':" + primScenAvatarIn + ". Arr:" + arrayitem[0].ToString() + "," + arrayitem[1].ToString());
436 } 437 }
437
438 } 438 }
439 } 439 }
440 else 440 else
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 19de4ca..b81dba7 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
3using Axiom.Math; 3using Axiom.Math;
4using Ode.NET; 4using Ode.NET;
5using OpenSim.Framework; 5using OpenSim.Framework;
6using OpenSim.Framework.Console;
6using OpenSim.Region.Physics.Manager; 7using OpenSim.Region.Physics.Manager;
7 8
8namespace OpenSim.Region.Physics.OdePlugin 9namespace OpenSim.Region.Physics.OdePlugin
@@ -47,12 +48,9 @@ namespace OpenSim.Region.Physics.OdePlugin
47 private const float MassMultiplier = 150f; // Ref: Water: 1000kg.. this iset to 500 48 private const float MassMultiplier = 150f; // Ref: Water: 1000kg.. this iset to 500
48 private int debugcounter = 0; 49 private int debugcounter = 0;
49 50
50
51 public OdePrim(String primName, OdeScene parent_scene, IntPtr targetSpace, PhysicsVector pos, PhysicsVector size, 51 public OdePrim(String primName, OdeScene parent_scene, IntPtr targetSpace, PhysicsVector pos, PhysicsVector size,
52 Quaternion rotation, IMesh mesh, PrimitiveBaseShape pbs, bool pisPhysical) 52 Quaternion rotation, IMesh mesh, PrimitiveBaseShape pbs, bool pisPhysical)
53 { 53 {
54
55
56 _velocity = new PhysicsVector(); 54 _velocity = new PhysicsVector();
57 _position = pos; 55 _position = pos;
58 m_taintposition = pos; 56 m_taintposition = pos;
@@ -98,8 +96,6 @@ namespace OpenSim.Region.Physics.OdePlugin
98 } 96 }
99 m_primName = primName; 97 m_primName = primName;
100 98
101
102
103 lock (OdeScene.OdeLock) 99 lock (OdeScene.OdeLock)
104 { 100 {
105 if (mesh != null) 101 if (mesh != null)
@@ -243,11 +239,11 @@ namespace OpenSim.Region.Physics.OdePlugin
243 int[] arrayitem = _parent_scene.calculateSpaceArrayItemFromPos(_position); 239 int[] arrayitem = _parent_scene.calculateSpaceArrayItemFromPos(_position);
244 if (primScenAvatarIn == "0") 240 if (primScenAvatarIn == "0")
245 { 241 {
246 OpenSim.Framework.Console.MainLog.Instance.Verbose("Physics", "Prim " + m_primName + " in space with no prim: " + primScenAvatarIn + ". Expected to be at: " + m_targetSpace.ToString() + " . Arr:': " + arrayitem[0].ToString() + "," + arrayitem[1].ToString()); 242 MainLog.Instance.Verbose("Physics", "Prim " + m_primName + " in space with no prim: " + primScenAvatarIn + ". Expected to be at: " + m_targetSpace.ToString() + " . Arr:': " + arrayitem[0].ToString() + "," + arrayitem[1].ToString());
247 } 243 }
248 else 244 else
249 { 245 {
250 OpenSim.Framework.Console.MainLog.Instance.Verbose("Physics", "Prim " + m_primName + " in Prim space with prim: " + primScenAvatarIn + ". Expected to be at: " + m_targetSpace.ToString() + ". Arr:" + arrayitem[0].ToString() + "," + arrayitem[1].ToString()); 246 MainLog.Instance.Verbose("Physics", "Prim " + m_primName + " in Prim space with prim: " + primScenAvatarIn + ". Expected to be at: " + m_targetSpace.ToString() + ". Arr:" + arrayitem[0].ToString() + "," + arrayitem[1].ToString());
251 } 247 }
252 m_targetSpace = _parent_scene.recalculateSpaceForGeom(prim_geom, _position, m_targetSpace); 248 m_targetSpace = _parent_scene.recalculateSpaceForGeom(prim_geom, _position, m_targetSpace);
253 d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z); 249 d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z);
@@ -361,13 +357,10 @@ namespace OpenSim.Region.Physics.OdePlugin
361 enableBody(); 357 enableBody();
362 d.BodyEnable(Body); 358 d.BodyEnable(Body);
363 } 359 }
364
365 } 360 }
366 361
367
368 _parent_scene.geom_name_map[prim_geom] = oldname; 362 _parent_scene.geom_name_map[prim_geom] = oldname;
369 363
370
371 m_taintsize = _size; 364 m_taintsize = _size;
372 } 365 }
373 public void changeshape(float timestamp) 366 public void changeshape(float timestamp)
@@ -382,9 +375,7 @@ namespace OpenSim.Region.Physics.OdePlugin
382 d.GeomDestroy(prim_geom); 375 d.GeomDestroy(prim_geom);
383 if (_mesh != null) 376 if (_mesh != null)
384 { 377 {
385
386 d.GeomBoxSetLengths(prim_geom, _size.X, _size.Y, _size.Z); 378 d.GeomBoxSetLengths(prim_geom, _size.X, _size.Y, _size.Z);
387
388 } 379 }
389 380
390 // Construction of new prim 381 // Construction of new prim
@@ -421,9 +412,6 @@ namespace OpenSim.Region.Physics.OdePlugin
421 } 412 }
422 _parent_scene.geom_name_map[prim_geom] = oldname; 413 _parent_scene.geom_name_map[prim_geom] = oldname;
423 414
424
425
426
427 m_taintshape = false; 415 m_taintshape = false;
428 } 416 }
429 public override bool IsPhysical 417 public override bool IsPhysical
@@ -470,7 +458,6 @@ namespace OpenSim.Region.Physics.OdePlugin
470 { 458 {
471 get { return _position; } 459 get { return _position; }
472 460
473
474 set 461 set
475 { 462 {
476 _position = value; 463 _position = value;
@@ -484,7 +471,6 @@ namespace OpenSim.Region.Physics.OdePlugin
484 set 471 set
485 { 472 {
486 _size = value; 473 _size = value;
487
488 } 474 }
489 } 475 }
490 476
@@ -493,7 +479,6 @@ namespace OpenSim.Region.Physics.OdePlugin
493 set 479 set
494 { 480 {
495 _pbs = value; 481 _pbs = value;
496
497 } 482 }
498 } 483 }
499 484
@@ -634,7 +619,6 @@ namespace OpenSim.Region.Physics.OdePlugin
634 base.RequestPhysicsterseUpdate(); 619 base.RequestPhysicsterseUpdate();
635 m_lastUpdateSent = true; 620 m_lastUpdateSent = true;
636 } 621 }
637
638 } 622 }
639 else 623 else
640 { 624 {
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 1e05274..845d4f9 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -31,6 +31,7 @@ using System.Collections.Generic;
31using Axiom.Math; 31using Axiom.Math;
32using Ode.NET; 32using Ode.NET;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Framework.Console;
34using OpenSim.Region.Physics.Manager; 35using OpenSim.Region.Physics.Manager;
35 36
36//using OpenSim.Region.Physics.OdePlugin.Meshing; 37//using OpenSim.Region.Physics.OdePlugin.Meshing;
@@ -242,7 +243,7 @@ namespace OpenSim.Region.Physics.OdePlugin
242 } 243 }
243 catch (System.Runtime.InteropServices.SEHException) 244 catch (System.Runtime.InteropServices.SEHException)
244 { 245 {
245 OpenSim.Framework.Console.MainLog.Instance.Error("PHYSICS", "The Operating system shut down ODE because of corrupt memory. This could be a result of really irregular terrain. If this repeats continuously, restart using Basic Physics and terrain fill your terrain. Restarting the sim."); 246 MainLog.Instance.Error("PHYSICS", "The Operating system shut down ODE because of corrupt memory. This could be a result of really irregular terrain. If this repeats continuously, restart using Basic Physics and terrain fill your terrain. Restarting the sim.");
246 base.TriggerPhysicsBasedRestart(); 247 base.TriggerPhysicsBasedRestart();
247 } 248 }
248 249
@@ -438,7 +439,7 @@ namespace OpenSim.Region.Physics.OdePlugin
438 } 439 }
439 else 440 else
440 { 441 {
441 OpenSim.Framework.Console.MainLog.Instance.Verbose("Physics", "Invalid Scene passed to 'removeprim from scene':" + ((OdePrim)prim).m_targetSpace.ToString()); 442 MainLog.Instance.Verbose("Physics", "Invalid Scene passed to 'removeprim from scene':" + ((OdePrim)prim).m_targetSpace.ToString());
442 } 443 }
443 } 444 }
444 } 445 }
@@ -460,7 +461,7 @@ namespace OpenSim.Region.Physics.OdePlugin
460 } 461 }
461 else 462 else
462 { 463 {
463 OpenSim.Framework.Console.MainLog.Instance.Verbose("Physics", "Invalid Scene passed to 'removeprim from scene':" + ((OdePrim)prim).m_targetSpace.ToString()); 464 MainLog.Instance.Verbose("Physics", "Invalid Scene passed to 'removeprim from scene':" + ((OdePrim)prim).m_targetSpace.ToString());
464 } 465 }
465 } 466 }
466 } 467 }
@@ -508,7 +509,7 @@ namespace OpenSim.Region.Physics.OdePlugin
508 } 509 }
509 else 510 else
510 { 511 {
511 OpenSim.Framework.Console.MainLog.Instance.Verbose("Physics", "Invalid Scene passed to 'recalculatespace':" + currentspace.ToString() + " Geom:" + geom.ToString()); 512 MainLog.Instance.Verbose("Physics", "Invalid Scene passed to 'recalculatespace':" + currentspace.ToString() + " Geom:" + geom.ToString());
512 } 513 }
513 } 514 }
514 else 515 else
@@ -523,7 +524,7 @@ namespace OpenSim.Region.Physics.OdePlugin
523 } 524 }
524 else 525 else
525 { 526 {
526 OpenSim.Framework.Console.MainLog.Instance.Verbose("Physics", "Invalid Scene passed to 'recalculatespace':" + sGeomIsIn.ToString() + " Geom:" + geom.ToString()); 527 MainLog.Instance.Verbose("Physics", "Invalid Scene passed to 'recalculatespace':" + sGeomIsIn.ToString() + " Geom:" + geom.ToString());
527 } 528 }
528 } 529 }
529 } 530 }
@@ -543,7 +544,7 @@ namespace OpenSim.Region.Physics.OdePlugin
543 } 544 }
544 else 545 else
545 { 546 {
546 OpenSim.Framework.Console.MainLog.Instance.Verbose("Physics", "Invalid Scene passed to 'recalculatespace':" + currentspace.ToString() + " Geom:" + geom.ToString()); 547 MainLog.Instance.Verbose("Physics", "Invalid Scene passed to 'recalculatespace':" + currentspace.ToString() + " Geom:" + geom.ToString());
547 } 548 }
548 549
549 } 550 }
@@ -561,7 +562,7 @@ namespace OpenSim.Region.Physics.OdePlugin
561 } 562 }
562 else 563 else
563 { 564 {
564 OpenSim.Framework.Console.MainLog.Instance.Verbose("Physics", "Invalid Scene passed to 'recalculatespace':" + currentspace.ToString() + " Geom:" + geom.ToString()); 565 MainLog.Instance.Verbose("Physics", "Invalid Scene passed to 'recalculatespace':" + currentspace.ToString() + " Geom:" + geom.ToString());
565 566
566 } 567 }
567 } 568 }
@@ -578,7 +579,7 @@ namespace OpenSim.Region.Physics.OdePlugin
578 } 579 }
579 else 580 else
580 { 581 {
581 OpenSim.Framework.Console.MainLog.Instance.Verbose("Physics", "Invalid Scene passed to 'recalculatespace':" + sGeomIsIn.ToString() + " Geom:" + geom.ToString()); 582 MainLog.Instance.Verbose("Physics", "Invalid Scene passed to 'recalculatespace':" + sGeomIsIn.ToString() + " Geom:" + geom.ToString());
582 583
583 } 584 }
584 } 585 }
@@ -612,7 +613,7 @@ namespace OpenSim.Region.Physics.OdePlugin
612 public IntPtr calculateSpaceForGeom(PhysicsVector pos) 613 public IntPtr calculateSpaceForGeom(PhysicsVector pos)
613 { 614 {
614 int[] xyspace = calculateSpaceArrayItemFromPos(pos); 615 int[] xyspace = calculateSpaceArrayItemFromPos(pos);
615 //OpenSim.Framework.Console.MainLog.Instance.Verbose("Physics", "Attempting to use arrayItem: " + xyspace[0].ToString() + "," + xyspace[1].ToString()); 616 //MainLog.Instance.Verbose("Physics", "Attempting to use arrayItem: " + xyspace[0].ToString() + "," + xyspace[1].ToString());
616 IntPtr locationbasedspace = staticPrimspace[xyspace[0],xyspace[1]]; 617 IntPtr locationbasedspace = staticPrimspace[xyspace[0],xyspace[1]];
617 618
618 //locationbasedspace = space; 619 //locationbasedspace = space;
@@ -818,7 +819,7 @@ namespace OpenSim.Region.Physics.OdePlugin
818 } 819 }
819 catch (System.StackOverflowException) 820 catch (System.StackOverflowException)
820 { 821 {
821 OpenSim.Framework.Console.MainLog.Instance.Error("PHYSICS", "The operating system wasn't able to allocate enough memory for the simulation. Restarting the sim."); 822 MainLog.Instance.Error("PHYSICS", "The operating system wasn't able to allocate enough memory for the simulation. Restarting the sim.");
822 base.TriggerPhysicsBasedRestart(); 823 base.TriggerPhysicsBasedRestart();
823 } 824 }
824 825
generated by cgit v1.1 at 2024-11-05 13:25:55 +0000