aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
authorMW2007-08-31 12:19:36 +0000
committerMW2007-08-31 12:19:36 +0000
commitf388a4725477b2e3238ccf19ea18dd05a98cdca0 (patch)
treeb810a65238213d357326f329df169161846547ce /OpenSim/Grid
parentchange debugging around failed prim loading. I have one prim that doesn't (diff)
downloadopensim-SC-f388a4725477b2e3238ccf19ea18dd05a98cdca0.zip
opensim-SC-f388a4725477b2e3238ccf19ea18dd05a98cdca0.tar.gz
opensim-SC-f388a4725477b2e3238ccf19ea18dd05a98cdca0.tar.bz2
opensim-SC-f388a4725477b2e3238ccf19ea18dd05a98cdca0.tar.xz
Added a Debug method to the Console/log class that has the Conditional attribute (set to "DEBUG"), so we can use that for writing extra debug info to the console. [for anyone who doesn't know about the Conditional attribute, it is a attribute that can be set on a method, and then any call to that method will on be compiled if the terms of that condition are met, ie is this case only if "DEBUG" is true. So its a cleaner implementation of the #if #endif directives].
A few other minor changes.
Diffstat (limited to '')
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index d38f5d4..885cd02 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -278,9 +278,9 @@ namespace OpenSim.Grid.GridServer
278 TheSim.regionLocZ = 0; 278 TheSim.regionLocZ = 0;
279 TheSim.regionMapTextureID = new LLUUID((string)requestData["map-image-id"]); 279 TheSim.regionMapTextureID = new LLUUID((string)requestData["map-image-id"]);
280 280
281 TheSim.regionHandle = Helpers.UIntsToLong((TheSim.regionLocX * 256), (TheSim.regionLocY * 256)); 281 TheSim.regionHandle = Helpers.UIntsToLong((TheSim.regionLocX * 256), (TheSim.regionLocY * 256));
282 System.Console.WriteLine("adding region " + TheSim.regionLocX + " , " + TheSim.regionLocY + " , " + TheSim.serverURI);
283 TheSim.serverURI = "http://" + TheSim.serverIP + ":" + TheSim.serverPort + "/"; 282 TheSim.serverURI = "http://" + TheSim.serverIP + ":" + TheSim.serverPort + "/";
283 System.Console.WriteLine("adding region " + TheSim.regionLocX + " , " + TheSim.regionLocY + " , " + TheSim.serverURI);
284 TheSim.httpServerURI = "http://" + TheSim.serverIP + ":" + TheSim.httpPort + "/"; 284 TheSim.httpServerURI = "http://" + TheSim.serverIP + ":" + TheSim.httpPort + "/";
285 285
286 286