diff options
author | Adam Frisby | 2007-05-12 15:32:04 +0000 |
---|---|---|
committer | Adam Frisby | 2007-05-12 15:32:04 +0000 |
commit | bd05850be1ce0dcf45c37b5e7b7c53ace2682b2b (patch) | |
tree | f4b4af88ceba3f9cb2d861fadae901280c40147f | |
parent | Only 193 warnings to go! (diff) | |
download | opensim-SC-bd05850be1ce0dcf45c37b5e7b7c53ace2682b2b.zip opensim-SC-bd05850be1ce0dcf45c37b5e7b7c53ace2682b2b.tar.gz opensim-SC-bd05850be1ce0dcf45c37b5e7b7c53ace2682b2b.tar.bz2 opensim-SC-bd05850be1ce0dcf45c37b5e7b7c53ace2682b2b.tar.xz |
93 warnings in the compiler, 93 warnings appear, you fix one up, create two more, 94 warnings in the compiler...
Diffstat (limited to '')
-rw-r--r-- | OpenSim.RegionServer/OpenSimMain.cs | 68 | ||||
-rw-r--r-- | OpenSim.RegionServer/RegionInfo.cs | 28 | ||||
-rw-r--r-- | OpenSim.RegionServer/SimClient.cs | 28 | ||||
-rw-r--r-- | OpenSim.RegionServer/world/Avatar.cs | 10 | ||||
-rw-r--r-- | OpenSim.RegionServer/world/AvatarAnimations.cs | 2 | ||||
-rw-r--r-- | OpenSim.RegionServer/world/World.cs | 62 | ||||
-rw-r--r-- | OpenSim.RegionServer/world/WorldPacketHandlers.cs | 2 |
7 files changed, 100 insertions, 100 deletions
diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs index 8d89c6a..d522e2b 100644 --- a/OpenSim.RegionServer/OpenSimMain.cs +++ b/OpenSim.RegionServer/OpenSimMain.cs | |||
@@ -122,7 +122,7 @@ namespace OpenSim | |||
122 | { | 122 | { |
123 | this.SetupFromConfigFile(this.localConfig); | 123 | this.SetupFromConfigFile(this.localConfig); |
124 | } | 124 | } |
125 | m_console.WriteLine("Main.cs:Startup() - Loading configuration"); | 125 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Loading configuration"); |
126 | this.regionData.InitConfig(this.m_sandbox, this.localConfig); | 126 | this.regionData.InitConfig(this.m_sandbox, this.localConfig); |
127 | this.localConfig.Close();//for now we can close it as no other classes read from it , but this should change | 127 | this.localConfig.Close();//for now we can close it as no other classes read from it , but this should change |
128 | 128 | ||
@@ -133,7 +133,7 @@ namespace OpenSim | |||
133 | GridServers.AssetDll = "OpenSim.GridInterfaces.Local.dll"; | 133 | GridServers.AssetDll = "OpenSim.GridInterfaces.Local.dll"; |
134 | GridServers.GridDll = "OpenSim.GridInterfaces.Local.dll"; | 134 | GridServers.GridDll = "OpenSim.GridInterfaces.Local.dll"; |
135 | 135 | ||
136 | m_console.WriteLine("Starting in Sandbox mode"); | 136 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Starting in Sandbox mode"); |
137 | } | 137 | } |
138 | else | 138 | else |
139 | { | 139 | { |
@@ -147,7 +147,7 @@ namespace OpenSim | |||
147 | } | 147 | } |
148 | GridServers.GridDll = "OpenSim.GridInterfaces.Remote.dll"; | 148 | GridServers.GridDll = "OpenSim.GridInterfaces.Remote.dll"; |
149 | 149 | ||
150 | m_console.WriteLine("Starting in Grid mode"); | 150 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Starting in Grid mode"); |
151 | } | 151 | } |
152 | 152 | ||
153 | try | 153 | try |
@@ -156,7 +156,7 @@ namespace OpenSim | |||
156 | } | 156 | } |
157 | catch (Exception e) | 157 | catch (Exception e) |
158 | { | 158 | { |
159 | m_console.WriteLine(e.Message + "\nSorry, could not setup the grid interface"); | 159 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH,e.Message + "\nSorry, could not setup the grid interface"); |
160 | Environment.Exit(1); | 160 | Environment.Exit(1); |
161 | } | 161 | } |
162 | 162 | ||
@@ -169,7 +169,7 @@ namespace OpenSim | |||
169 | } | 169 | } |
170 | catch (Exception e) | 170 | catch (Exception e) |
171 | { | 171 | { |
172 | m_console.WriteLine(e.Message + "\nSorry, could not setup local cache"); | 172 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH,e.Message + "\nSorry, could not setup local cache"); |
173 | Environment.Exit(1); | 173 | Environment.Exit(1); |
174 | } | 174 | } |
175 | 175 | ||
@@ -185,11 +185,11 @@ namespace OpenSim | |||
185 | { | 185 | { |
186 | if (GridServers.GridServer.RequestConnection(regionData.SimUUID, regionData.IPListenAddr, (uint)regionData.IPListenPort)) | 186 | if (GridServers.GridServer.RequestConnection(regionData.SimUUID, regionData.IPListenAddr, (uint)regionData.IPListenPort)) |
187 | { | 187 | { |
188 | m_console.WriteLine("Main.cs:Startup() - Success: Got a grid connection OK!"); | 188 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Success: Got a grid connection OK!"); |
189 | } | 189 | } |
190 | else | 190 | else |
191 | { | 191 | { |
192 | m_console.WriteLine("Main.cs:Startup() - FAILED: Unable to get connection to grid. Shutting down."); | 192 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.CRITICAL,"Main.cs:Startup() - FAILED: Unable to get connection to grid. Shutting down."); |
193 | Shutdown(); | 193 | Shutdown(); |
194 | } | 194 | } |
195 | 195 | ||
@@ -215,7 +215,7 @@ namespace OpenSim | |||
215 | } | 215 | } |
216 | catch (Exception e) | 216 | catch (Exception e) |
217 | { | 217 | { |
218 | m_console.WriteLine(e.Message + "\nBAD ERROR! THIS SHOULD NOT HAPPEN! Bad GridData from the grid interface!!!! ZOMG!!!"); | 218 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.CRITICAL,e.Message + "\nBAD ERROR! THIS SHOULD NOT HAPPEN! Bad GridData from the grid interface!!!! ZOMG!!!"); |
219 | Environment.Exit(1); | 219 | Environment.Exit(1); |
220 | } | 220 | } |
221 | } | 221 | } |
@@ -223,8 +223,8 @@ namespace OpenSim | |||
223 | } | 223 | } |
224 | 224 | ||
225 | 225 | ||
226 | m_console.WriteLine("Main.cs:Startup() - We are " + regionData.RegionName + " at " + regionData.RegionLocX.ToString() + "," + regionData.RegionLocY.ToString()); | 226 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL,"Main.cs:Startup() - We are " + regionData.RegionName + " at " + regionData.RegionLocX.ToString() + "," + regionData.RegionLocY.ToString()); |
227 | m_console.WriteLine("Initialising world"); | 227 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Initialising world"); |
228 | LocalWorld = new World(this._packetServer.ClientThreads, regionData.RegionHandle, regionData.RegionName); | 228 | LocalWorld = new World(this._packetServer.ClientThreads, regionData.RegionHandle, regionData.RegionName); |
229 | LocalWorld.InventoryCache = InventoryCache; | 229 | LocalWorld.InventoryCache = InventoryCache; |
230 | LocalWorld.AssetCache = AssetCache; | 230 | LocalWorld.AssetCache = AssetCache; |
@@ -240,7 +240,7 @@ namespace OpenSim | |||
240 | LocalWorld.LoadStorageDLL("OpenSim.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded. | 240 | LocalWorld.LoadStorageDLL("OpenSim.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded. |
241 | LocalWorld.LoadWorldMap(); | 241 | LocalWorld.LoadWorldMap(); |
242 | 242 | ||
243 | m_console.WriteLine("Main.cs:Startup() - Starting up messaging system"); | 243 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Starting up messaging system"); |
244 | LocalWorld.PhysScene = this.physManager.GetPhysicsScene(this.m_physicsEngine); //should be reading from the config file what physics engine to use | 244 | LocalWorld.PhysScene = this.physManager.GetPhysicsScene(this.m_physicsEngine); //should be reading from the config file what physics engine to use |
245 | LocalWorld.PhysScene.SetTerrain(LocalWorld.Terrain.getHeights1D()); | 245 | LocalWorld.PhysScene.SetTerrain(LocalWorld.Terrain.getHeights1D()); |
246 | 246 | ||
@@ -252,7 +252,7 @@ namespace OpenSim | |||
252 | AssetCache.LoadDefaultTextureSet(); | 252 | AssetCache.LoadDefaultTextureSet(); |
253 | } | 253 | } |
254 | 254 | ||
255 | m_console.WriteLine("Main.cs:Startup() - Initialising HTTP server"); | 255 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Initialising HTTP server"); |
256 | // HttpServer = new SimCAPSHTTPServer(GridServers.GridServer, Cfg.IPListenPort); | 256 | // HttpServer = new SimCAPSHTTPServer(GridServers.GridServer, Cfg.IPListenPort); |
257 | 257 | ||
258 | BaseHttpServer httpServer = new BaseHttpServer(regionData.IPListenPort); | 258 | BaseHttpServer httpServer = new BaseHttpServer(regionData.IPListenPort); |
@@ -351,12 +351,12 @@ namespace OpenSim | |||
351 | AdminWebFront adminWebFront = new AdminWebFront("Admin", LocalWorld, InventoryCache, adminLoginServer); | 351 | AdminWebFront adminWebFront = new AdminWebFront("Admin", LocalWorld, InventoryCache, adminLoginServer); |
352 | adminWebFront.LoadMethods(httpServer); | 352 | adminWebFront.LoadMethods(httpServer); |
353 | 353 | ||
354 | m_console.WriteLine("Main.cs:Startup() - Starting HTTP server"); | 354 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Starting HTTP server"); |
355 | httpServer.Start(); | 355 | httpServer.Start(); |
356 | 356 | ||
357 | if (gridServer.GetName() == "Remote") | 357 | if (gridServer.GetName() == "Remote") |
358 | { | 358 | { |
359 | m_console.WriteLine("Main.cs:Startup() - Starting up OGS protocol server"); | 359 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Starting up OGS protocol server"); |
360 | OGSServer.Start(); | 360 | OGSServer.Start(); |
361 | } | 361 | } |
362 | 362 | ||
@@ -429,7 +429,7 @@ namespace OpenSim | |||
429 | switch (attri) | 429 | switch (attri) |
430 | { | 430 | { |
431 | default: | 431 | default: |
432 | m_console.WriteLine("Main.cs: SetupFromConfig() - Invalid value for PhysicsEngine attribute, terminating"); | 432 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"Main.cs: SetupFromConfig() - Invalid value for PhysicsEngine attribute, terminating"); |
433 | Environment.Exit(1); | 433 | Environment.Exit(1); |
434 | break; | 434 | break; |
435 | 435 | ||
@@ -498,8 +498,8 @@ namespace OpenSim | |||
498 | } | 498 | } |
499 | catch (Exception e) | 499 | catch (Exception e) |
500 | { | 500 | { |
501 | m_console.WriteLine(e.Message + "\nSorry, a fatal error occurred while trying to load the config DLL"); | 501 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.CRITICAL,e.Message + "\nSorry, a fatal error occurred while trying to load the config DLL"); |
502 | m_console.WriteLine("Can not continue starting up"); | 502 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.CRITICAL,"Can not continue starting up"); |
503 | Environment.Exit(1); | 503 | Environment.Exit(1); |
504 | return null; | 504 | return null; |
505 | } | 505 | } |
@@ -551,7 +551,7 @@ namespace OpenSim | |||
551 | XmlRpcResponse GridResp; | 551 | XmlRpcResponse GridResp; |
552 | foreach (Hashtable neighbour in ((RemoteGridBase)this.GridServers.GridServer).neighbours) | 552 | foreach (Hashtable neighbour in ((RemoteGridBase)this.GridServers.GridServer).neighbours) |
553 | { | 553 | { |
554 | m_console.WriteLine("http://" + neighbour["sim_ip"] + ":" + neighbour["sim_port"]); | 554 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE,"http://" + neighbour["sim_ip"] + ":" + neighbour["sim_port"]); |
555 | SimParams = new Hashtable(); | 555 | SimParams = new Hashtable(); |
556 | SimParams["session_id"] = ((RemoteGridBase)this.GridServers.GridServer).agentcircuits[useCircuit.CircuitCode.Code].SessionID.ToString(); | 556 | SimParams["session_id"] = ((RemoteGridBase)this.GridServers.GridServer).agentcircuits[useCircuit.CircuitCode.Code].SessionID.ToString(); |
557 | SimParams["secure_session_id"] = ((RemoteGridBase)this.GridServers.GridServer).agentcircuits[useCircuit.CircuitCode.Code].SecureSessionID.ToString(); | 557 | SimParams["secure_session_id"] = ((RemoteGridBase)this.GridServers.GridServer).agentcircuits[useCircuit.CircuitCode.Code].SecureSessionID.ToString(); |
@@ -591,21 +591,21 @@ namespace OpenSim | |||
591 | 591 | ||
592 | private void MainServerListener() | 592 | private void MainServerListener() |
593 | { | 593 | { |
594 | m_console.WriteLine("Main.cs:MainServerListener() - New thread started"); | 594 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:MainServerListener() - New thread started"); |
595 | m_console.WriteLine("Main.cs:MainServerListener() - Opening UDP socket on " + regionData.IPListenAddr + ":" + regionData.IPListenPort); | 595 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:MainServerListener() - Opening UDP socket on " + regionData.IPListenAddr + ":" + regionData.IPListenPort); |
596 | 596 | ||
597 | ServerIncoming = new IPEndPoint(IPAddress.Any, regionData.IPListenPort); | 597 | ServerIncoming = new IPEndPoint(IPAddress.Any, regionData.IPListenPort); |
598 | Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp); | 598 | Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp); |
599 | Server.Bind(ServerIncoming); | 599 | Server.Bind(ServerIncoming); |
600 | 600 | ||
601 | m_console.WriteLine("Main.cs:MainServerListener() - UDP socket bound, getting ready to listen"); | 601 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:MainServerListener() - UDP socket bound, getting ready to listen"); |
602 | 602 | ||
603 | ipeSender = new IPEndPoint(IPAddress.Any, 0); | 603 | ipeSender = new IPEndPoint(IPAddress.Any, 0); |
604 | epSender = (EndPoint)ipeSender; | 604 | epSender = (EndPoint)ipeSender; |
605 | ReceivedData = new AsyncCallback(this.OnReceivedData); | 605 | ReceivedData = new AsyncCallback(this.OnReceivedData); |
606 | Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null); | 606 | Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null); |
607 | 607 | ||
608 | m_console.WriteLine("Main.cs:MainServerListener() - Listening..."); | 608 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:MainServerListener() - Listening..."); |
609 | 609 | ||
610 | } | 610 | } |
611 | 611 | ||
@@ -650,11 +650,11 @@ namespace OpenSim | |||
650 | /// </summary> | 650 | /// </summary> |
651 | public virtual void Shutdown() | 651 | public virtual void Shutdown() |
652 | { | 652 | { |
653 | m_console.WriteLine("Main.cs:Shutdown() - Closing all threads"); | 653 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Shutdown() - Closing all threads"); |
654 | m_console.WriteLine("Main.cs:Shutdown() - Killing listener thread"); | 654 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Shutdown() - Killing listener thread"); |
655 | m_console.WriteLine("Main.cs:Shutdown() - Killing clients"); | 655 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Shutdown() - Killing clients"); |
656 | // IMPLEMENT THIS | 656 | // IMPLEMENT THIS |
657 | m_console.WriteLine("Main.cs:Shutdown() - Closing console and terminating"); | 657 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Shutdown() - Closing console and terminating"); |
658 | LocalWorld.Close(); | 658 | LocalWorld.Close(); |
659 | GridServers.Close(); | 659 | GridServers.Close(); |
660 | m_console.Close(); | 660 | m_console.Close(); |
@@ -681,8 +681,8 @@ namespace OpenSim | |||
681 | switch (command) | 681 | switch (command) |
682 | { | 682 | { |
683 | case "help": | 683 | case "help": |
684 | m_console.WriteLine("show users - show info about connected users"); | 684 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH,"show users - show info about connected users"); |
685 | m_console.WriteLine("shutdown - disconnect all clients and shutdown"); | 685 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH,"shutdown - disconnect all clients and shutdown"); |
686 | break; | 686 | break; |
687 | 687 | ||
688 | case "show": | 688 | case "show": |
@@ -693,7 +693,7 @@ namespace OpenSim | |||
693 | string result = ""; | 693 | string result = ""; |
694 | if (!LocalWorld.Terrain.RunTerrainCmd(cmdparams, ref result)) | 694 | if (!LocalWorld.Terrain.RunTerrainCmd(cmdparams, ref result)) |
695 | { | 695 | { |
696 | m_console.WriteLine(result); | 696 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH,result); |
697 | } | 697 | } |
698 | break; | 698 | break; |
699 | 699 | ||
@@ -702,7 +702,7 @@ namespace OpenSim | |||
702 | break; | 702 | break; |
703 | 703 | ||
704 | default: | 704 | default: |
705 | m_console.WriteLine("Unknown command"); | 705 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH,"Unknown command"); |
706 | break; | 706 | break; |
707 | } | 707 | } |
708 | } | 708 | } |
@@ -716,18 +716,18 @@ namespace OpenSim | |||
716 | switch (ShowWhat) | 716 | switch (ShowWhat) |
717 | { | 717 | { |
718 | case "uptime": | 718 | case "uptime": |
719 | m_console.WriteLine("OpenSim has been running since " + startuptime.ToString()); | 719 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH,"OpenSim has been running since " + startuptime.ToString()); |
720 | m_console.WriteLine("That is " + (DateTime.Now - startuptime).ToString()); | 720 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH,"That is " + (DateTime.Now - startuptime).ToString()); |
721 | break; | 721 | break; |
722 | case "users": | 722 | case "users": |
723 | OpenSim.world.Avatar TempAv; | 723 | OpenSim.world.Avatar TempAv; |
724 | m_console.WriteLine(String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}", "Firstname", "Lastname", "Agent ID", "Session ID", "Circuit", "IP")); | 724 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH,String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}", "Firstname", "Lastname", "Agent ID", "Session ID", "Circuit", "IP")); |
725 | foreach (libsecondlife.LLUUID UUID in LocalWorld.Entities.Keys) | 725 | foreach (libsecondlife.LLUUID UUID in LocalWorld.Entities.Keys) |
726 | { | 726 | { |
727 | if (LocalWorld.Entities[UUID].ToString() == "OpenSim.world.Avatar") | 727 | if (LocalWorld.Entities[UUID].ToString() == "OpenSim.world.Avatar") |
728 | { | 728 | { |
729 | TempAv = (OpenSim.world.Avatar)LocalWorld.Entities[UUID]; | 729 | TempAv = (OpenSim.world.Avatar)LocalWorld.Entities[UUID]; |
730 | m_console.WriteLine(String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}", TempAv.firstname, TempAv.lastname, UUID, TempAv.ControllingClient.SessionID, TempAv.ControllingClient.CircuitCode, TempAv.ControllingClient.userEP.ToString())); | 730 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH,String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}", TempAv.firstname, TempAv.lastname, UUID, TempAv.ControllingClient.SessionID, TempAv.ControllingClient.CircuitCode, TempAv.ControllingClient.userEP.ToString())); |
731 | } | 731 | } |
732 | } | 732 | } |
733 | break; | 733 | break; |
diff --git a/OpenSim.RegionServer/RegionInfo.cs b/OpenSim.RegionServer/RegionInfo.cs index 759ee64..edab1e5 100644 --- a/OpenSim.RegionServer/RegionInfo.cs +++ b/OpenSim.RegionServer/RegionInfo.cs | |||
@@ -87,7 +87,7 @@ namespace OpenSim | |||
87 | stIn.Close(); | 87 | stIn.Close(); |
88 | gridresp.Close(); | 88 | gridresp.Close(); |
89 | 89 | ||
90 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("RegionInfo.CS:SaveToGrid() - Grid said: " + GridResponse); | 90 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"RegionInfo.CS:SaveToGrid() - Grid said: " + GridResponse); |
91 | } | 91 | } |
92 | 92 | ||
93 | public void InitConfig(bool sandboxMode, IGenericConfig configData) | 93 | public void InitConfig(bool sandboxMode, IGenericConfig configData) |
@@ -241,21 +241,21 @@ namespace OpenSim | |||
241 | } | 241 | } |
242 | catch (Exception e) | 242 | catch (Exception e) |
243 | { | 243 | { |
244 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Config.cs:InitConfig() - Exception occured"); | 244 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"Config.cs:InitConfig() - Exception occured"); |
245 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(e.ToString()); | 245 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,e.ToString()); |
246 | } | 246 | } |
247 | 247 | ||
248 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Sim settings loaded:"); | 248 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Sim settings loaded:"); |
249 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("UUID: " + this.SimUUID.ToStringHyphenated()); | 249 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "UUID: " + this.SimUUID.ToStringHyphenated()); |
250 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Name: " + this.RegionName); | 250 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Name: " + this.RegionName); |
251 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]"); | 251 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]"); |
252 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Region Handle: " + this.RegionHandle.ToString()); | 252 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Region Handle: " + this.RegionHandle.ToString()); |
253 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Listening on IP: " + this.IPListenAddr + ":" + this.IPListenPort); | 253 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Listening on IP: " + this.IPListenAddr + ":" + this.IPListenPort); |
254 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Sandbox Mode? " + isSandbox.ToString()); | 254 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Sandbox Mode? " + isSandbox.ToString()); |
255 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Asset URL: " + this.AssetURL); | 255 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Asset URL: " + this.AssetURL); |
256 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Asset key: " + this.AssetSendKey); | 256 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Asset key: " + this.AssetSendKey); |
257 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Grid URL: " + this.GridURL); | 257 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Grid URL: " + this.GridURL); |
258 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Grid key: " + this.GridSendKey); | 258 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Grid key: " + this.GridSendKey); |
259 | } | 259 | } |
260 | } | 260 | } |
261 | } | 261 | } |
diff --git a/OpenSim.RegionServer/SimClient.cs b/OpenSim.RegionServer/SimClient.cs index 856909c..76bf46e 100644 --- a/OpenSim.RegionServer/SimClient.cs +++ b/OpenSim.RegionServer/SimClient.cs | |||
@@ -110,7 +110,7 @@ namespace OpenSim | |||
110 | m_child = child; | 110 | m_child = child; |
111 | m_regionData = regionDat; | 111 | m_regionData = regionDat; |
112 | 112 | ||
113 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenSimClient.cs - Started up new client thread to handle incoming request"); | 113 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"OpenSimClient.cs - Started up new client thread to handle incoming request"); |
114 | cirpack = initialcirpack; | 114 | cirpack = initialcirpack; |
115 | userEP = remoteEP; | 115 | userEP = remoteEP; |
116 | if (m_gridServer.GetName() == "Remote") | 116 | if (m_gridServer.GetName() == "Remote") |
@@ -169,7 +169,7 @@ namespace OpenSim | |||
169 | neighbourx += 1; | 169 | neighbourx += 1; |
170 | newpos.Y = 1; | 170 | newpos.Y = 1; |
171 | } | 171 | } |
172 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("SimClient.cs:CrossSimBorder() - Crossing border to neighbouring sim at [" + neighbourx.ToString() + "," + neighboury.ToString() + "]"); | 172 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"SimClient.cs:CrossSimBorder() - Crossing border to neighbouring sim at [" + neighbourx.ToString() + "," + neighboury.ToString() + "]"); |
173 | 173 | ||
174 | Hashtable SimParams; | 174 | Hashtable SimParams; |
175 | ArrayList SendParams; | 175 | ArrayList SendParams; |
@@ -220,7 +220,7 @@ namespace OpenSim | |||
220 | 220 | ||
221 | public void UpgradeClient() | 221 | public void UpgradeClient() |
222 | { | 222 | { |
223 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("SimClient.cs:UpgradeClient() - upgrading child to full agent"); | 223 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"SimClient.cs:UpgradeClient() - upgrading child to full agent"); |
224 | this.m_child = false; | 224 | this.m_child = false; |
225 | this.m_world.RemoveViewerAgent(this); | 225 | this.m_world.RemoveViewerAgent(this); |
226 | if (!this.m_sandboxMode) | 226 | if (!this.m_sandboxMode) |
@@ -233,7 +233,7 @@ namespace OpenSim | |||
233 | 233 | ||
234 | public void DowngradeClient() | 234 | public void DowngradeClient() |
235 | { | 235 | { |
236 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("SimClient.cs:UpgradeClient() - changing full agent to child"); | 236 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"SimClient.cs:UpgradeClient() - changing full agent to child"); |
237 | this.m_child = true; | 237 | this.m_child = true; |
238 | this.m_world.RemoveViewerAgent(this); | 238 | this.m_world.RemoveViewerAgent(this); |
239 | this.m_world.AddViewerAgent(this); | 239 | this.m_world.AddViewerAgent(this); |
@@ -398,7 +398,7 @@ namespace OpenSim | |||
398 | m_world.AddNewPrim((ObjectAddPacket)Pack, this); | 398 | m_world.AddNewPrim((ObjectAddPacket)Pack, this); |
399 | break; | 399 | break; |
400 | case PacketType.ObjectLink: | 400 | case PacketType.ObjectLink: |
401 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(Pack.ToString()); | 401 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,Pack.ToString()); |
402 | ObjectLinkPacket link = (ObjectLinkPacket)Pack; | 402 | ObjectLinkPacket link = (ObjectLinkPacket)Pack; |
403 | uint parentprimid = 0; | 403 | uint parentprimid = 0; |
404 | OpenSim.world.Primitive parentprim = null; | 404 | OpenSim.world.Primitive parentprim = null; |
@@ -426,7 +426,7 @@ namespace OpenSim | |||
426 | } | 426 | } |
427 | break; | 427 | break; |
428 | case PacketType.ObjectScale: | 428 | case PacketType.ObjectScale: |
429 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(Pack.ToString()); | 429 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,Pack.ToString()); |
430 | break; | 430 | break; |
431 | case PacketType.ObjectShape: | 431 | case PacketType.ObjectShape: |
432 | ObjectShapePacket shape = (ObjectShapePacket)Pack; | 432 | ObjectShapePacket shape = (ObjectShapePacket)Pack; |
@@ -657,7 +657,7 @@ namespace OpenSim | |||
657 | { | 657 | { |
658 | if ((now - packet.TickCount > RESEND_TIMEOUT) && (!packet.Header.Resent)) | 658 | if ((now - packet.TickCount > RESEND_TIMEOUT) && (!packet.Header.Resent)) |
659 | { | 659 | { |
660 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Resending " + packet.Type.ToString() + " packet, " + | 660 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE,"Resending " + packet.Type.ToString() + " packet, " + |
661 | (now - packet.TickCount) + "ms have passed"); | 661 | (now - packet.TickCount) + "ms have passed"); |
662 | 662 | ||
663 | packet.Header.Resent = true; | 663 | packet.Header.Resent = true; |
@@ -676,7 +676,7 @@ namespace OpenSim | |||
676 | if (PendingAcks.Count > 250) | 676 | if (PendingAcks.Count > 250) |
677 | { | 677 | { |
678 | // FIXME: Handle the odd case where we have too many pending ACKs queued up | 678 | // FIXME: Handle the odd case where we have too many pending ACKs queued up |
679 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Too many ACKs queued up!"); | 679 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE,"Too many ACKs queued up!"); |
680 | return; | 680 | return; |
681 | } | 681 | } |
682 | 682 | ||
@@ -799,7 +799,7 @@ namespace OpenSim | |||
799 | } | 799 | } |
800 | catch (Exception) | 800 | catch (Exception) |
801 | { | 801 | { |
802 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection " + userEP.ToString() + " - killing thread"); | 802 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection " + userEP.ToString() + " - killing thread"); |
803 | ClientThread.Abort(); | 803 | ClientThread.Abort(); |
804 | } | 804 | } |
805 | 805 | ||
@@ -860,7 +860,7 @@ namespace OpenSim | |||
860 | 860 | ||
861 | protected virtual void ClientLoop() | 861 | protected virtual void ClientLoop() |
862 | { | 862 | { |
863 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenSimClient.cs:ClientLoop() - Entered loop"); | 863 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"OpenSimClient.cs:ClientLoop() - Entered loop"); |
864 | while (true) | 864 | while (true) |
865 | { | 865 | { |
866 | QueItem nextPacket = PacketQueue.Dequeue(); | 866 | QueItem nextPacket = PacketQueue.Dequeue(); |
@@ -879,7 +879,7 @@ namespace OpenSim | |||
879 | 879 | ||
880 | protected virtual void InitNewClient() | 880 | protected virtual void InitNewClient() |
881 | { | 881 | { |
882 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenSimClient.cs:InitNewClient() - Adding viewer agent to world"); | 882 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"OpenSimClient.cs:InitNewClient() - Adding viewer agent to world"); |
883 | 883 | ||
884 | m_world.AddViewerAgent(this); | 884 | m_world.AddViewerAgent(this); |
885 | world.Entity tempent = m_world.Entities[this.AgentID]; | 885 | world.Entity tempent = m_world.Entities[this.AgentID]; |
@@ -893,12 +893,12 @@ namespace OpenSim | |||
893 | if (!sessionInfo.Authorised) | 893 | if (!sessionInfo.Authorised) |
894 | { | 894 | { |
895 | //session/circuit not authorised | 895 | //session/circuit not authorised |
896 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenSimClient.cs:AuthUser() - New user request denied to " + userEP.ToString()); | 896 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL,"OpenSimClient.cs:AuthUser() - New user request denied to " + userEP.ToString()); |
897 | ClientThread.Abort(); | 897 | ClientThread.Abort(); |
898 | } | 898 | } |
899 | else | 899 | else |
900 | { | 900 | { |
901 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenSimClient.cs:AuthUser() - Got authenticated connection from " + userEP.ToString()); | 901 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL,"OpenSimClient.cs:AuthUser() - Got authenticated connection from " + userEP.ToString()); |
902 | //session is authorised | 902 | //session is authorised |
903 | this.AgentID = cirpack.CircuitCode.ID; | 903 | this.AgentID = cirpack.CircuitCode.ID; |
904 | this.SessionID = cirpack.CircuitCode.SessionID; | 904 | this.SessionID = cirpack.CircuitCode.SessionID; |
@@ -947,7 +947,7 @@ namespace OpenSim | |||
947 | 947 | ||
948 | protected virtual bool Logout(SimClient simClient, Packet packet) | 948 | protected virtual bool Logout(SimClient simClient, Packet packet) |
949 | { | 949 | { |
950 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenSimClient.cs:ProcessInPacket() - Got a logout request"); | 950 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"OpenSimClient.cs:ProcessInPacket() - Got a logout request"); |
951 | //send reply to let the client logout | 951 | //send reply to let the client logout |
952 | LogoutReplyPacket logReply = new LogoutReplyPacket(); | 952 | LogoutReplyPacket logReply = new LogoutReplyPacket(); |
953 | logReply.AgentData.AgentID = this.AgentID; | 953 | logReply.AgentData.AgentID = this.AgentID; |
diff --git a/OpenSim.RegionServer/world/Avatar.cs b/OpenSim.RegionServer/world/Avatar.cs index abb43c6..f8a1a5a 100644 --- a/OpenSim.RegionServer/world/Avatar.cs +++ b/OpenSim.RegionServer/world/Avatar.cs | |||
@@ -45,7 +45,7 @@ namespace OpenSim.world | |||
45 | m_regionTerraform = regionTerraform; | 45 | m_regionTerraform = regionTerraform; |
46 | m_regionWaterHeight = regionWater; | 46 | m_regionWaterHeight = regionWater; |
47 | 47 | ||
48 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Avatar.cs - Loading details from grid (DUMMY)"); | 48 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Avatar.cs - Loading details from grid (DUMMY)"); |
49 | ControllingClient = TheClient; | 49 | ControllingClient = TheClient; |
50 | localid = 8880000 + (this.m_world._localNumber++); | 50 | localid = 8880000 + (this.m_world._localNumber++); |
51 | Pos = ControllingClient.startpos; | 51 | Pos = ControllingClient.startpos; |
@@ -168,7 +168,7 @@ namespace OpenSim.world | |||
168 | 168 | ||
169 | public void CompleteMovement(World RegionInfo) | 169 | public void CompleteMovement(World RegionInfo) |
170 | { | 170 | { |
171 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Avatar.cs:CompleteMovement() - Constructing AgentMovementComplete packet"); | 171 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE,"Avatar.cs:CompleteMovement() - Constructing AgentMovementComplete packet"); |
172 | AgentMovementCompletePacket mov = new AgentMovementCompletePacket(); | 172 | AgentMovementCompletePacket mov = new AgentMovementCompletePacket(); |
173 | mov.AgentData.SessionID = this.ControllingClient.SessionID; | 173 | mov.AgentData.SessionID = this.ControllingClient.SessionID; |
174 | mov.AgentData.AgentID = this.ControllingClient.AgentID; | 174 | mov.AgentData.AgentID = this.ControllingClient.AgentID; |
@@ -334,11 +334,11 @@ namespace OpenSim.world | |||
334 | //really really should be moved somewhere else (RegionInfo.cs ?) | 334 | //really really should be moved somewhere else (RegionInfo.cs ?) |
335 | public void SendRegionHandshake(World RegionInfo) | 335 | public void SendRegionHandshake(World RegionInfo) |
336 | { | 336 | { |
337 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Avatar.cs:SendRegionHandshake() - Creating empty RegionHandshake packet"); | 337 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE,"Avatar.cs:SendRegionHandshake() - Creating empty RegionHandshake packet"); |
338 | System.Text.Encoding _enc = System.Text.Encoding.ASCII; | 338 | System.Text.Encoding _enc = System.Text.Encoding.ASCII; |
339 | RegionHandshakePacket handshake = new RegionHandshakePacket(); | 339 | RegionHandshakePacket handshake = new RegionHandshakePacket(); |
340 | 340 | ||
341 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Avatar.cs:SendRegionhandshake() - Filling in RegionHandshake details"); | 341 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE,"Avatar.cs:SendRegionhandshake() - Filling in RegionHandshake details"); |
342 | handshake.RegionInfo.BillableFactor = 0; | 342 | handshake.RegionInfo.BillableFactor = 0; |
343 | handshake.RegionInfo.IsEstateManager = false; | 343 | handshake.RegionInfo.IsEstateManager = false; |
344 | handshake.RegionInfo.TerrainHeightRange00 = 60; | 344 | handshake.RegionInfo.TerrainHeightRange00 = 60; |
@@ -369,7 +369,7 @@ namespace OpenSim.world | |||
369 | handshake.RegionInfo.TerrainDetail3 = new LLUUID("00000000-0000-0000-0000-000000000000"); | 369 | handshake.RegionInfo.TerrainDetail3 = new LLUUID("00000000-0000-0000-0000-000000000000"); |
370 | handshake.RegionInfo.CacheID = new LLUUID("545ec0a5-5751-1026-8a0b-216e38a7ab37"); | 370 | handshake.RegionInfo.CacheID = new LLUUID("545ec0a5-5751-1026-8a0b-216e38a7ab37"); |
371 | 371 | ||
372 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Avatar.cs:SendRegionHandshake() - Sending RegionHandshake packet"); | 372 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE,"Avatar.cs:SendRegionHandshake() - Sending RegionHandshake packet"); |
373 | this.ControllingClient.OutPacket(handshake); | 373 | this.ControllingClient.OutPacket(handshake); |
374 | } | 374 | } |
375 | 375 | ||
diff --git a/OpenSim.RegionServer/world/AvatarAnimations.cs b/OpenSim.RegionServer/world/AvatarAnimations.cs index 36c4c7e..b554af8 100644 --- a/OpenSim.RegionServer/world/AvatarAnimations.cs +++ b/OpenSim.RegionServer/world/AvatarAnimations.cs | |||
@@ -17,7 +17,7 @@ namespace OpenSim.world | |||
17 | 17 | ||
18 | public void LoadAnims() | 18 | public void LoadAnims() |
19 | { | 19 | { |
20 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Avatar.cs:LoadAnims() - Loading avatar animations"); | 20 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Avatar.cs:LoadAnims() - Loading avatar animations"); |
21 | AnimsLLUUID.Add("ANIM_AGENT_AFRAID", new LLUUID("6b61c8e8-4747-0d75-12d7-e49ff207a4ca")); | 21 | AnimsLLUUID.Add("ANIM_AGENT_AFRAID", new LLUUID("6b61c8e8-4747-0d75-12d7-e49ff207a4ca")); |
22 | AnimsLLUUID.Add("ANIM_AGENT_AIM_BAZOOKA_R", new LLUUID("b5b4a67d-0aee-30d2-72cd-77b333e932ef")); | 22 | AnimsLLUUID.Add("ANIM_AGENT_AIM_BAZOOKA_R", new LLUUID("b5b4a67d-0aee-30d2-72cd-77b333e932ef")); |
23 | AnimsLLUUID.Add("ANIM_AGENT_AIM_BOW_L", new LLUUID("46bb4359-de38-4ed8-6a22-f1f52fe8f506")); | 23 | AnimsLLUUID.Add("ANIM_AGENT_AIM_BOW_L", new LLUUID("46bb4359-de38-4ed8-6a22-f1f52fe8f506")); |
diff --git a/OpenSim.RegionServer/world/World.cs b/OpenSim.RegionServer/world/World.cs index 0ae4ae2..225ce81 100644 --- a/OpenSim.RegionServer/world/World.cs +++ b/OpenSim.RegionServer/world/World.cs | |||
@@ -64,12 +64,12 @@ namespace OpenSim.world | |||
64 | m_scriptHandlers = new Dictionary<LLUUID, ScriptHandler>(); | 64 | m_scriptHandlers = new Dictionary<LLUUID, ScriptHandler>(); |
65 | m_scripts = new Dictionary<string, ScriptFactory>(); | 65 | m_scripts = new Dictionary<string, ScriptFactory>(); |
66 | 66 | ||
67 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs - creating new entitities instance"); | 67 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"World.cs - creating new entitities instance"); |
68 | Entities = new Dictionary<libsecondlife.LLUUID, Entity>(); | 68 | Entities = new Dictionary<libsecondlife.LLUUID, Entity>(); |
69 | Avatars = new Dictionary<LLUUID, Avatar>(); | 69 | Avatars = new Dictionary<LLUUID, Avatar>(); |
70 | Prims = new Dictionary<LLUUID, Primitive>(); | 70 | Prims = new Dictionary<LLUUID, Primitive>(); |
71 | 71 | ||
72 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs - creating LandMap"); | 72 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"World.cs - creating LandMap"); |
73 | TerrainManager = new TerrainManager(new SecondLife()); | 73 | TerrainManager = new TerrainManager(new SecondLife()); |
74 | Terrain = new TerrainEngine(); | 74 | Terrain = new TerrainEngine(); |
75 | Avatar.SetupTemplate("avatar-texture.dat"); | 75 | Avatar.SetupTemplate("avatar-texture.dat"); |
@@ -82,7 +82,7 @@ namespace OpenSim.world | |||
82 | } | 82 | } |
83 | catch (Exception e) | 83 | catch (Exception e) |
84 | { | 84 | { |
85 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: Constructor failed with exception " + e.ToString()); | 85 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.CRITICAL,"World.cs: Constructor failed with exception " + e.ToString()); |
86 | } | 86 | } |
87 | } | 87 | } |
88 | 88 | ||
@@ -100,7 +100,7 @@ namespace OpenSim.world | |||
100 | } | 100 | } |
101 | catch (Exception e) | 101 | catch (Exception e) |
102 | { | 102 | { |
103 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: AddScript() - Failed with exception " + e.ToString()); | 103 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"World.cs: AddScript() - Failed with exception " + e.ToString()); |
104 | } | 104 | } |
105 | } | 105 | } |
106 | 106 | ||
@@ -152,7 +152,7 @@ namespace OpenSim.world | |||
152 | } | 152 | } |
153 | catch (Exception e) | 153 | catch (Exception e) |
154 | { | 154 | { |
155 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: AddScript() - Failed with exception " + e.ToString()); | 155 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"World.cs: AddScript() - Failed with exception " + e.ToString()); |
156 | } | 156 | } |
157 | } | 157 | } |
158 | 158 | ||
@@ -230,7 +230,7 @@ namespace OpenSim.world | |||
230 | } | 230 | } |
231 | catch (Exception e) | 231 | catch (Exception e) |
232 | { | 232 | { |
233 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: Update() - Failed with exception " + e.ToString()); | 233 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"World.cs: Update() - Failed with exception " + e.ToString()); |
234 | } | 234 | } |
235 | updateLock.ReleaseMutex(); | 235 | updateLock.ReleaseMutex(); |
236 | } | 236 | } |
@@ -274,7 +274,7 @@ namespace OpenSim.world | |||
274 | } | 274 | } |
275 | catch (Exception e) | 275 | catch (Exception e) |
276 | { | 276 | { |
277 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: LoadStorageDLL() - Failed with exception " + e.ToString()); | 277 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"World.cs: LoadStorageDLL() - Failed with exception " + e.ToString()); |
278 | return false; | 278 | return false; |
279 | } | 279 | } |
280 | } | 280 | } |
@@ -308,7 +308,7 @@ namespace OpenSim.world | |||
308 | } | 308 | } |
309 | catch (Exception e) | 309 | catch (Exception e) |
310 | { | 310 | { |
311 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString()); | 311 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"World.cs: RegenerateTerrain() - Failed with exception " + e.ToString()); |
312 | } | 312 | } |
313 | } | 313 | } |
314 | 314 | ||
@@ -339,7 +339,7 @@ namespace OpenSim.world | |||
339 | } | 339 | } |
340 | catch (Exception e) | 340 | catch (Exception e) |
341 | { | 341 | { |
342 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString()); | 342 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"World.cs: RegenerateTerrain() - Failed with exception " + e.ToString()); |
343 | } | 343 | } |
344 | } | 344 | } |
345 | 345 | ||
@@ -369,7 +369,7 @@ namespace OpenSim.world | |||
369 | } | 369 | } |
370 | catch (Exception e) | 370 | catch (Exception e) |
371 | { | 371 | { |
372 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString()); | 372 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"World.cs: RegenerateTerrain() - Failed with exception " + e.ToString()); |
373 | } | 373 | } |
374 | } | 374 | } |
375 | 375 | ||
@@ -397,7 +397,7 @@ namespace OpenSim.world | |||
397 | } | 397 | } |
398 | catch (Exception e) | 398 | catch (Exception e) |
399 | { | 399 | { |
400 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: LoadWorldMap() - Failed with exception " + e.ToString()); | 400 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"World.cs: LoadWorldMap() - Failed with exception " + e.ToString()); |
401 | } | 401 | } |
402 | } | 402 | } |
403 | 403 | ||
@@ -408,12 +408,12 @@ namespace OpenSim.world | |||
408 | { | 408 | { |
409 | try | 409 | try |
410 | { | 410 | { |
411 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: LoadPrimsFromStorage() - Loading primitives"); | 411 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"World.cs: LoadPrimsFromStorage() - Loading primitives"); |
412 | this.localStorage.LoadPrimitives(this); | 412 | this.localStorage.LoadPrimitives(this); |
413 | } | 413 | } |
414 | catch (Exception e) | 414 | catch (Exception e) |
415 | { | 415 | { |
416 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: LoadPrimsFromStorage() - Failed with exception " + e.ToString()); | 416 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"World.cs: LoadPrimsFromStorage() - Failed with exception " + e.ToString()); |
417 | } | 417 | } |
418 | } | 418 | } |
419 | 419 | ||
@@ -429,14 +429,14 @@ namespace OpenSim.world | |||
429 | { | 429 | { |
430 | _primCount = prim.LocalID + 1; | 430 | _primCount = prim.LocalID + 1; |
431 | } | 431 | } |
432 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: PrimFromStorage() - Reloading prim (localId " + prim.LocalID + " ) from storage"); | 432 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"World.cs: PrimFromStorage() - Reloading prim (localId " + prim.LocalID + " ) from storage"); |
433 | Primitive nPrim = new Primitive(m_clientThreads, m_regionHandle, this); | 433 | Primitive nPrim = new Primitive(m_clientThreads, m_regionHandle, this); |
434 | nPrim.CreateFromStorage(prim); | 434 | nPrim.CreateFromStorage(prim); |
435 | this.Entities.Add(nPrim.uuid, nPrim); | 435 | this.Entities.Add(nPrim.uuid, nPrim); |
436 | } | 436 | } |
437 | catch (Exception e) | 437 | catch (Exception e) |
438 | { | 438 | { |
439 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: PrimFromStorage() - Failed with exception " + e.ToString()); | 439 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"World.cs: PrimFromStorage() - Failed with exception " + e.ToString()); |
440 | } | 440 | } |
441 | } | 441 | } |
442 | 442 | ||
@@ -451,7 +451,7 @@ namespace OpenSim.world | |||
451 | } | 451 | } |
452 | catch (Exception e) | 452 | catch (Exception e) |
453 | { | 453 | { |
454 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: Close() - Failed with exception " + e.ToString()); | 454 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH,"World.cs: Close() - Failed with exception " + e.ToString()); |
455 | } | 455 | } |
456 | } | 456 | } |
457 | 457 | ||
@@ -481,7 +481,7 @@ namespace OpenSim.world | |||
481 | } | 481 | } |
482 | catch (Exception e) | 482 | catch (Exception e) |
483 | { | 483 | { |
484 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: SendLayerData() - Failed with exception " + e.ToString()); | 484 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"World.cs: SendLayerData() - Failed with exception " + e.ToString()); |
485 | } | 485 | } |
486 | } | 486 | } |
487 | 487 | ||
@@ -514,7 +514,7 @@ namespace OpenSim.world | |||
514 | } | 514 | } |
515 | catch (Exception e) | 515 | catch (Exception e) |
516 | { | 516 | { |
517 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: SendLayerData() - Failed with exception " + e.ToString()); | 517 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"World.cs: SendLayerData() - Failed with exception " + e.ToString()); |
518 | } | 518 | } |
519 | } | 519 | } |
520 | 520 | ||
@@ -537,7 +537,7 @@ namespace OpenSim.world | |||
537 | } | 537 | } |
538 | catch (Exception e) | 538 | catch (Exception e) |
539 | { | 539 | { |
540 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: GetInitialPrims() - Failed with exception " + e.ToString()); | 540 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"World.cs: GetInitialPrims() - Failed with exception " + e.ToString()); |
541 | } | 541 | } |
542 | } | 542 | } |
543 | 543 | ||
@@ -545,10 +545,10 @@ namespace OpenSim.world | |||
545 | { | 545 | { |
546 | try | 546 | try |
547 | { | 547 | { |
548 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent"); | 548 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent"); |
549 | Avatar newAvatar = new Avatar(agentClient, this, m_regionName, m_clientThreads, m_regionHandle, true, 20); | 549 | Avatar newAvatar = new Avatar(agentClient, this, m_regionName, m_clientThreads, m_regionHandle, true, 20); |
550 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Adding new avatar to world"); | 550 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"World.cs:AddViewerAgent() - Adding new avatar to world"); |
551 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Starting RegionHandshake "); | 551 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"World.cs:AddViewerAgent() - Starting RegionHandshake "); |
552 | newAvatar.SendRegionHandshake(this); | 552 | newAvatar.SendRegionHandshake(this); |
553 | if (!agentClient.m_child) | 553 | if (!agentClient.m_child) |
554 | { | 554 | { |
@@ -569,7 +569,7 @@ namespace OpenSim.world | |||
569 | } | 569 | } |
570 | catch (Exception e) | 570 | catch (Exception e) |
571 | { | 571 | { |
572 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: AddViewerAgent() - Failed with exception " + e.ToString()); | 572 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"World.cs: AddViewerAgent() - Failed with exception " + e.ToString()); |
573 | } | 573 | } |
574 | } | 574 | } |
575 | 575 | ||
@@ -588,7 +588,7 @@ namespace OpenSim.world | |||
588 | } | 588 | } |
589 | catch (Exception e) | 589 | catch (Exception e) |
590 | { | 590 | { |
591 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: RemoveViewerAgent() - Failed with exception " + e.ToString()); | 591 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"World.cs: RemoveViewerAgent() - Failed with exception " + e.ToString()); |
592 | } | 592 | } |
593 | } | 593 | } |
594 | 594 | ||
@@ -596,7 +596,7 @@ namespace OpenSim.world | |||
596 | { | 596 | { |
597 | try | 597 | try |
598 | { | 598 | { |
599 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: AddNewPrim() - Creating new prim"); | 599 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"World.cs: AddNewPrim() - Creating new prim"); |
600 | Primitive prim = new Primitive(m_clientThreads, m_regionHandle, this); | 600 | Primitive prim = new Primitive(m_clientThreads, m_regionHandle, this); |
601 | prim.CreateFromPacket(addPacket, AgentClient.AgentID, this._primCount); | 601 | prim.CreateFromPacket(addPacket, AgentClient.AgentID, this._primCount); |
602 | PhysicsVector pVec = new PhysicsVector(prim.Pos.X, prim.Pos.Y, prim.Pos.Z); | 602 | PhysicsVector pVec = new PhysicsVector(prim.Pos.X, prim.Pos.Y, prim.Pos.Z); |
@@ -614,7 +614,7 @@ namespace OpenSim.world | |||
614 | } | 614 | } |
615 | catch (Exception e) | 615 | catch (Exception e) |
616 | { | 616 | { |
617 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: AddNewPrim() - Failed with exception " + e.ToString()); | 617 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"World.cs: AddNewPrim() - Failed with exception " + e.ToString()); |
618 | } | 618 | } |
619 | } | 619 | } |
620 | 620 | ||
@@ -626,14 +626,14 @@ namespace OpenSim.world | |||
626 | if (Terrain.tainted > 0) | 626 | if (Terrain.tainted > 0) |
627 | { | 627 | { |
628 | Terrain.tainted = 0; | 628 | Terrain.tainted = 0; |
629 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: Backup() - Terrain tainted, saving."); | 629 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"World.cs: Backup() - Terrain tainted, saving."); |
630 | localStorage.SaveMap(Terrain.getHeights1D()); | 630 | localStorage.SaveMap(Terrain.getHeights1D()); |
631 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: Backup() - Terrain saved, informing Physics."); | 631 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"World.cs: Backup() - Terrain saved, informing Physics."); |
632 | phyScene.SetTerrain(Terrain.getHeights1D()); | 632 | phyScene.SetTerrain(Terrain.getHeights1D()); |
633 | } | 633 | } |
634 | 634 | ||
635 | // Primitive backup routines | 635 | // Primitive backup routines |
636 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: Backup() - Backing up Primitives"); | 636 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"World.cs: Backup() - Backing up Primitives"); |
637 | foreach (libsecondlife.LLUUID UUID in Entities.Keys) | 637 | foreach (libsecondlife.LLUUID UUID in Entities.Keys) |
638 | { | 638 | { |
639 | Entities[UUID].BackUp(); | 639 | Entities[UUID].BackUp(); |
@@ -645,7 +645,7 @@ namespace OpenSim.world | |||
645 | catch (Exception e) | 645 | catch (Exception e) |
646 | { | 646 | { |
647 | // Backup failed | 647 | // Backup failed |
648 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: Backup() - Backup Failed with exception " + e.ToString()); | 648 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH,"World.cs: Backup() - Backup Failed with exception " + e.ToString()); |
649 | return false; | 649 | return false; |
650 | } | 650 | } |
651 | } | 651 | } |
@@ -661,7 +661,7 @@ namespace OpenSim.world | |||
661 | } | 661 | } |
662 | catch (Exception e) | 662 | catch (Exception e) |
663 | { | 663 | { |
664 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: SetDefaultScripts() - Failed with exception " + e.ToString()); | 664 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"World.cs: SetDefaultScripts() - Failed with exception " + e.ToString()); |
665 | } | 665 | } |
666 | } | 666 | } |
667 | 667 | ||
diff --git a/OpenSim.RegionServer/world/WorldPacketHandlers.cs b/OpenSim.RegionServer/world/WorldPacketHandlers.cs index f4213d0..9e1f9a1 100644 --- a/OpenSim.RegionServer/world/WorldPacketHandlers.cs +++ b/OpenSim.RegionServer/world/WorldPacketHandlers.cs | |||
@@ -147,7 +147,7 @@ namespace OpenSim.world | |||
147 | //Uncomment when prim/object UUIDs are random or such | 147 | //Uncomment when prim/object UUIDs are random or such |
148 | //2007-03-22 - Randomskk | 148 | //2007-03-22 - Randomskk |
149 | //this._primCount--; | 149 | //this._primCount--; |
150 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Deleted UUID " + ent.uuid); | 150 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE,"Deleted UUID " + ent.uuid); |
151 | } | 151 | } |
152 | } | 152 | } |
153 | } | 153 | } |