aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJeff Ames2007-12-06 18:17:44 +0000
committerJeff Ames2007-12-06 18:17:44 +0000
commit73599c0f25f67b6a2de61a36849bb8ce0b7b5279 (patch)
tree6e653c7a057655b25b760cc6fa0ad07444718dd4 /OpenSim/Region
parentmore minor cleanup. added some command descriptions to region server help. (diff)
downloadopensim-SC_OLD-73599c0f25f67b6a2de61a36849bb8ce0b7b5279.zip
opensim-SC_OLD-73599c0f25f67b6a2de61a36849bb8ce0b7b5279.tar.gz
opensim-SC_OLD-73599c0f25f67b6a2de61a36849bb8ce0b7b5279.tar.bz2
opensim-SC_OLD-73599c0f25f67b6a2de61a36849bb8ce0b7b5279.tar.xz
removed obsolete Verbose() function
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/IApplicationPlugin.cs31
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs27
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs8
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs18
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs3
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/Script.cs2
8 files changed, 57 insertions, 38 deletions
diff --git a/OpenSim/Region/Application/IApplicationPlugin.cs b/OpenSim/Region/Application/IApplicationPlugin.cs
index adbc625..0e66330 100644
--- a/OpenSim/Region/Application/IApplicationPlugin.cs
+++ b/OpenSim/Region/Application/IApplicationPlugin.cs
@@ -1,4 +1,32 @@
1using System; 1/*
2* Copyright (c) Contributors, http://opensimulator.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4*
5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission.
15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*
27*/
28
29using System;
2using System.Collections.Generic; 30using System.Collections.Generic;
3using System.Text; 31using System.Text;
4using Mono.Addins; 32using Mono.Addins;
@@ -14,4 +42,3 @@ namespace OpenSim
14 void Close(); 42 void Close();
15 } 43 }
16} 44}
17
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index d6dc3ea..64fe8df 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -449,7 +449,7 @@ namespace OpenSim
449 449
450 public void handleRestartRegion(RegionInfo whichRegion) 450 public void handleRestartRegion(RegionInfo whichRegion)
451 { 451 {
452 MainLog.Instance.Error("MAIN", "Got Restart Singlal from SceneManager"); 452 MainLog.Instance.Error("MAIN", "Got restart signal from SceneManager");
453 // Shutting down the UDP server 453 // Shutting down the UDP server
454 bool foundUDPServer = false; 454 bool foundUDPServer = false;
455 int UDPServerElement = 0; 455 int UDPServerElement = 0;
@@ -543,7 +543,7 @@ namespace OpenSim
543 m_log.Verbose("SHUTDOWN", "Closing all threads"); 543 m_log.Verbose("SHUTDOWN", "Closing all threads");
544 m_log.Verbose("SHUTDOWN", "Killing listener thread"); 544 m_log.Verbose("SHUTDOWN", "Killing listener thread");
545 m_log.Verbose("SHUTDOWN", "Killing clients"); 545 m_log.Verbose("SHUTDOWN", "Killing clients");
546 // IMPLEMENT THIS 546 // TODO: implement this
547 m_log.Verbose("SHUTDOWN", "Closing console and terminating"); 547 m_log.Verbose("SHUTDOWN", "Closing console and terminating");
548 548
549 m_sceneManager.Close(); 549 m_sceneManager.Close();
@@ -789,10 +789,7 @@ namespace OpenSim
789 { 789 {
790 string regionName = CombineParams(cmdparams, 0); 790 string regionName = CombineParams(cmdparams, 0);
791 791
792 if (m_sceneManager.TrySetCurrentScene(regionName)) 792 if (!m_sceneManager.TrySetCurrentScene(regionName))
793 {
794 }
795 else
796 { 793 {
797 MainLog.Instance.Error("Couldn't set current region to: " + regionName); 794 MainLog.Instance.Error("Couldn't set current region to: " + regionName);
798 } 795 }
@@ -812,16 +809,14 @@ namespace OpenSim
812 break; 809 break;
813 810
814 case "export-map": 811 case "export-map":
815 812 if (cmdparams.Length > 0)
816 if (cmdparams.Length > 0) 813 {
817 { 814 m_sceneManager.CurrentOrFirstScene.ExportWorldMap(cmdparams[0]);
818 m_sceneManager.CurrentOrFirstScene.ExportWorldMap(cmdparams[0]); 815 }
819 } 816 else
820 else 817 {
821 { 818 m_sceneManager.CurrentOrFirstScene.ExportWorldMap("exportmap.jpg");
822 m_sceneManager.CurrentOrFirstScene.ExportWorldMap("exportmap.jpg"); 819 }
823 }
824
825 break; 820 break;
826 821
827 default: 822 default:
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 415b04e..fb1623b 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -2546,7 +2546,7 @@ namespace OpenSim.Region.ClientStack
2546 return; 2546 return;
2547 } 2547 }
2548 2548
2549 //MainLog.Instance.Verbose("Sending PacketAck"); 2549 //MainLog.Instance.Verbose("NETWORK", "Sending PacketAck");
2550 2550
2551 int i = 0; 2551 int i = 0;
2552 PacketAckPacket acks = new PacketAckPacket(); 2552 PacketAckPacket acks = new PacketAckPacket();
@@ -2701,7 +2701,6 @@ namespace OpenSim.Region.ClientStack
2701 } 2701 }
2702 break; 2702 break;
2703 case PacketType.AgentSetAppearance: 2703 case PacketType.AgentSetAppearance:
2704 //MainLog.Instance.Verbose("set appear", Pack.ToString());
2705 AgentSetAppearancePacket appear = (AgentSetAppearancePacket) Pack; 2704 AgentSetAppearancePacket appear = (AgentSetAppearancePacket) Pack;
2706 if (OnSetAppearance != null) 2705 if (OnSetAppearance != null)
2707 { 2706 {
@@ -2785,7 +2784,6 @@ namespace OpenSim.Region.ClientStack
2785 #region Objects/m_sceneObjects 2784 #region Objects/m_sceneObjects
2786 2785
2787 case PacketType.ObjectLink: 2786 case PacketType.ObjectLink:
2788 //MainLog.Instance.Verbose(Pack.ToString());
2789 ObjectLinkPacket link = (ObjectLinkPacket) Pack; 2787 ObjectLinkPacket link = (ObjectLinkPacket) Pack;
2790 uint parentprimid = 0; 2788 uint parentprimid = 0;
2791 List<uint> childrenprims = new List<uint>(); 2789 List<uint> childrenprims = new List<uint>();
@@ -2804,7 +2802,6 @@ namespace OpenSim.Region.ClientStack
2804 } 2802 }
2805 break; 2803 break;
2806 case PacketType.ObjectDelink: 2804 case PacketType.ObjectDelink:
2807 //MainLog.Instance.Verbose(Pack.ToString());
2808 ObjectDelinkPacket delink = (ObjectDelinkPacket) Pack; 2805 ObjectDelinkPacket delink = (ObjectDelinkPacket) Pack;
2809 2806
2810 // It appears the prim at index 0 is not always the root prim (for 2807 // It appears the prim at index 0 is not always the root prim (for
@@ -3677,8 +3674,7 @@ namespace OpenSim.Region.ClientStack
3677 MainLog.Instance.Debug("CLIENT", "possibly unhandled StartPingCheck packet"); 3674 MainLog.Instance.Debug("CLIENT", "possibly unhandled StartPingCheck packet");
3678 break; 3675 break;
3679 case PacketType.CompletePingCheck: 3676 case PacketType.CompletePingCheck:
3680 // Parhaps this should be processed on the Sim to determine whether or not to drop a dead client 3677 // TODO: Perhaps this should be processed on the Sim to determine whether or not to drop a dead client
3681 // Dumping it to the verbose console until it's handled properly.
3682 MainLog.Instance.Warn("CLIENT", "unhandled CompletePingCheck packet"); 3678 MainLog.Instance.Warn("CLIENT", "unhandled CompletePingCheck packet");
3683 break; 3679 break;
3684 case PacketType.ObjectScale: 3680 case PacketType.ObjectScale:
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 4c168b3..04bdf5a 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -37,16 +37,14 @@ namespace OpenSim.Region.Environment.Scenes
37 37
38 public InnerScene(Scene parent, RegionInfo regInfo, PermissionManager permissionsMngr) 38 public InnerScene(Scene parent, RegionInfo regInfo, PermissionManager permissionsMngr)
39 { 39 {
40
41 m_parentScene = parent; 40 m_parentScene = parent;
42 m_regInfo = regInfo; 41 m_regInfo = regInfo;
43 PermissionsMngr = permissionsMngr; 42 PermissionsMngr = permissionsMngr;
44 QuadTree = new BasicQuadTreeNode(null, "/0/", 0, 0, 256, 256); 43 QuadTree = new BasicQuadTreeNode(null, "/0/", 0, 0, 256, 256);
45 QuadTree.Subdivide(); 44 QuadTree.Subdivide();
46 QuadTree.Subdivide(); 45 QuadTree.Subdivide();
47
48
49 } 46 }
47
50 public PhysicsScene PhysicsScene 48 public PhysicsScene PhysicsScene
51 { 49 {
52 get 50 get
@@ -372,7 +370,6 @@ namespace OpenSim.Region.Environment.Scenes
372 370
373 #region Other Methods 371 #region Other Methods
374 372
375
376 public void physicsBasedCrash() 373 public void physicsBasedCrash()
377 { 374 {
378 if (UnRecoverableError != null) 375 if (UnRecoverableError != null)
@@ -662,8 +659,6 @@ namespace OpenSim.Region.Environment.Scenes
662 /// <param name="prims"></param> 659 /// <param name="prims"></param>
663 public void DelinkObjects(List<uint> primIds) 660 public void DelinkObjects(List<uint> primIds)
664 { 661 {
665 //MainLog.Instance.Verbose("DelinkObjects()");
666
667 SceneObjectGroup parenPrim = null; 662 SceneObjectGroup parenPrim = null;
668 663
669 // Need a list of the SceneObjectGroup local ids 664 // Need a list of the SceneObjectGroup local ids
@@ -744,17 +739,20 @@ namespace OpenSim.Region.Environment.Scenes
744 } 739 }
745 740
746 } 741 }
742
743 /// <summary>
744 /// Calculates the distance between two Vector3s
745 /// </summary>
746 /// <param name="v1"></param>
747 /// <param name="v2"></param>
748 /// <returns></returns>
747 public float Vector3Distance(Vector3 v1, Vector3 v2) 749 public float Vector3Distance(Vector3 v1, Vector3 v2)
748 { 750 {
749 // Calculates the distance between two Vector3s
750 // We don't really need the double floating point precision... 751 // We don't really need the double floating point precision...
751 // so casting it to a single 752 // so casting it to a single
752 753
753 return (float)Math.Sqrt((v1.x - v2.x) * (v1.x - v2.x) + (v1.y - v2.y) * (v1.y - v2.y) + (v1.z - v2.z) * (v1.z - v2.z)); 754 return (float)Math.Sqrt((v1.x - v2.x) * (v1.x - v2.x) + (v1.y - v2.y) * (v1.y - v2.y) + (v1.z - v2.z) * (v1.z - v2.z));
754
755 } 755 }
756 #endregion 756 #endregion
757 } 757 }
758} 758}
759
760
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index d8abe90..dbcd332 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -411,7 +411,7 @@ namespace OpenSim.Region.Environment.Scenes
411 foreach (DeRezObjectPacket.ObjectDataBlock Data in DeRezPacket.ObjectData) 411 foreach (DeRezObjectPacket.ObjectDataBlock Data in DeRezPacket.ObjectData)
412 { 412 {
413 EntityBase selectedEnt = null; 413 EntityBase selectedEnt = null;
414 //MainLog.Instance.Verbose("LocalID:" + Data.ObjectLocalID.ToString()); 414 //MainLog.Instance.Verbose("CLIENT", "LocalID:" + Data.ObjectLocalID.ToString());
415 foreach (EntityBase ent in Entities.Values) 415 foreach (EntityBase ent in Entities.Values)
416 { 416 {
417 if (ent.LocalId == Data.ObjectLocalID) 417 if (ent.LocalId == Data.ObjectLocalID)
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
index c1e4805..484b9f1 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 //MainLog.Instance.Verbose("ScenePresence.Animations.cs:LoadAnims() - Loading avatar animations"); 47 //MainLog.Instance.Verbose("CLIENT", "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 // MainLog.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)"); 61 // MainLog.Instance.Verbose("CLIENT", "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 2f00515..83d3306 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -711,6 +711,9 @@ namespace OpenSim.Region.Environment.Scenes
711 SceneObjectPart part = m_scene.GetSceneObjectPart(targetID); 711 SceneObjectPart part = m_scene.GetSceneObjectPart(targetID);
712 if (part != null) 712 if (part != null)
713 { 713 {
714 // TODO: determine position to sit at based on scene geometry; don't trust offset from client
715 // see http://wiki.secondlife.com/wiki/User:Andrew_Linden/Office_Hours/2007_11_06 for details on how LL does it
716
714 pos = part.AbsolutePosition + offset; 717 pos = part.AbsolutePosition + offset;
715 718
716 if (m_physicsActor != null) 719 if (m_physicsActor != null)
diff --git a/OpenSim/Region/ExtensionsScriptModule/Script.cs b/OpenSim/Region/ExtensionsScriptModule/Script.cs
index 350ca2d..4493741 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Script.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Script.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.ExtensionsScriptModule
58 58
59 private void events_OnFrame() 59 private void events_OnFrame()
60 { 60 {
61 //script.logger.Verbose("Hello World!"); 61 //script.logger.Verbose("TESTSCRIPT", "Hello World!");
62 } 62 }
63 } 63 }
64} \ No newline at end of file 64} \ No newline at end of file