aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorJeff Ames2007-12-04 22:14:53 +0000
committerJeff Ames2007-12-04 22:14:53 +0000
commitf195725db447aad7595810a9950f656163bf1c13 (patch)
tree2d62dbd3635b008e9c41c2645fc71a6abbcc0a26 /OpenSim/Region/Environment/Scenes
parentmade log messages for known unhandled packet types shorter and yellower. add... (diff)
downloadopensim-SC_OLD-f195725db447aad7595810a9950f656163bf1c13.zip
opensim-SC_OLD-f195725db447aad7595810a9950f656163bf1c13.tar.gz
opensim-SC_OLD-f195725db447aad7595810a9950f656163bf1c13.tar.bz2
opensim-SC_OLD-f195725db447aad7595810a9950f656163bf1c13.tar.xz
keeping opensim safe for children -- made some namespace references less explicit
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-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
8 files changed, 15 insertions, 35 deletions
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>