ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 09:16:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Allow create-region to load files from arbitrary locations

Browse Source
This commit is contained in:
Melanie Thielker
2008-09-30 10:50:41 +00:00
parent 1842e81218
commit f00b24ff9e
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Framework/RegionInfo.cs
View File

@@ -217,6 +217,11 @@ namespace OpenSim.Framework
// Apparently, we're applying the same estatesettings regardless of whether it's local or remote.
// MT: Yes. Estates can't span trust boundaries. Therefore, it can be
// assumed that all instances belonging to one estate are able to
// access the same database server. Since estate settings are lodaed
// from there, that should be sufficient for full remote administration
public RegionInfo(string description, string filename, bool skipConsoleConfig)
{
configMember =

7
OpenSim/Region/Application/OpenSim.cs
View File

@@ -311,7 +311,12 @@ namespace OpenSim
case "create-region":
string regionsDir = ConfigSource.Source.Configs["Startup"].GetString("regionload_regionsdir", "Regions").Trim();
CreateRegion(new RegionInfo(cmdparams[0], String.Format("{0}/{1}", regionsDir, cmdparams[1]), false), true);
string regionFile = String.Format("{0}/{1}", regionsDir, cmdparams[1]);
// Allow absolute and relative specifiers
if (cmdparams[1].StartsWith("/") || cmdparams[1].StartsWith("\\") || cmdparams[1].StartsWith(".."))
regionFile = cmdparams[1];
CreateRegion(new RegionInfo(cmdparams[0], regionFile, false), true);
break;
case "remove-region":