aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorTeravus Ovares2008-03-04 14:39:51 +0000
committerTeravus Ovares2008-03-04 14:39:51 +0000
commit18324773d26a903b83e6361b8186c0ad2681b1b3 (patch)
tree14fd8b0f00ceb0ddc0341a71a3b010db41bca883 /OpenSim
parentCleaned up a couple compiler warnings. (diff)
downloadopensim-SC-18324773d26a903b83e6361b8186c0ad2681b1b3.zip
opensim-SC-18324773d26a903b83e6361b8186c0ad2681b1b3.tar.gz
opensim-SC-18324773d26a903b83e6361b8186c0ad2681b1b3.tar.bz2
opensim-SC-18324773d26a903b83e6361b8186c0ad2681b1b3.tar.xz
* One line fix to get everything working again. Essentially set the originRegionID = RegionID in RegionInfo.cs on line 375
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/RegionInfo.cs1
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs1
2 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 43e2a24..bbd9f08 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -372,6 +372,7 @@ namespace OpenSim.Framework
372 { 372 {
373 case "sim_UUID": 373 case "sim_UUID":
374 RegionID = (LLUUID) configuration_result; 374 RegionID = (LLUUID) configuration_result;
375 originRegionID = (LLUUID)configuration_result;
375 break; 376 break;
376 case "sim_name": 377 case "sim_name":
377 RegionName = (string) configuration_result; 378 RegionName = (string) configuration_result;
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 43e7e99..1b1549e 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -235,7 +235,6 @@ namespace OpenSim.Region.Environment.Scenes
235 ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, bool SeeIntoRegionFromNeighbor) 235 ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, bool SeeIntoRegionFromNeighbor)
236 { 236 {
237 updateLock = new Mutex(false); 237 updateLock = new Mutex(false);
238
239 m_moduleLoader = moduleLoader; 238 m_moduleLoader = moduleLoader;
240 m_authenticateHandler = authen; 239 m_authenticateHandler = authen;
241 CommsManager = commsMan; 240 CommsManager = commsMan;