aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorMelanie Thielker2009-01-02 17:41:12 +0000
committerMelanie Thielker2009-01-02 17:41:12 +0000
commit0138fdc5fddbe30924484686716465984e8f59c2 (patch)
tree3d734b2f626db149b14d945b424ece36e654673a /OpenSim/Region/Application
parentUse only one (static) (de-)serializer for (de-)serializing SOPs. (diff)
downloadopensim-SC-0138fdc5fddbe30924484686716465984e8f59c2.zip
opensim-SC-0138fdc5fddbe30924484686716465984e8f59c2.tar.gz
opensim-SC-0138fdc5fddbe30924484686716465984e8f59c2.tar.bz2
opensim-SC-0138fdc5fddbe30924484686716465984e8f59c2.tar.xz
Allow some values that are set in OpenSim.ini to be set from region config
XML as well.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/OpenSim.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index b3ca651..2ef3308 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -341,7 +341,7 @@ namespace OpenSim
341 if (cmdparams[1].StartsWith("/") || cmdparams[1].StartsWith("\\") || cmdparams[1].StartsWith("..")) 341 if (cmdparams[1].StartsWith("/") || cmdparams[1].StartsWith("\\") || cmdparams[1].StartsWith(".."))
342 regionFile = cmdparams[1]; 342 regionFile = cmdparams[1];
343 343
344 CreateRegion(new RegionInfo(cmdparams[0], regionFile, false), true); 344 CreateRegion(new RegionInfo(cmdparams[0], regionFile, false, ConfigSource.Source), true);
345 break; 345 break;
346 346
347 case "remove-region": 347 case "remove-region":