aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorMW2007-08-19 13:35:20 +0000
committerMW2007-08-19 13:35:20 +0000
commitc89db49f3cd3bbd60577eb5a1787ccf8dea930e3 (patch)
tree2b51b0d261724427933f543dd2f39ef8cd21127f /OpenSim/Region/Application
parentCode comments on recent changes in EventQueueManager (diff)
downloadopensim-SC-c89db49f3cd3bbd60577eb5a1787ccf8dea930e3.zip
opensim-SC-c89db49f3cd3bbd60577eb5a1787ccf8dea930e3.tar.gz
opensim-SC-c89db49f3cd3bbd60577eb5a1787ccf8dea930e3.tar.bz2
opensim-SC-c89db49f3cd3bbd60577eb5a1787ccf8dea930e3.tar.xz
Sqlite datastore should now save the textures and extraparams data (used by sculpties) correctly. [Really need to add a ExtraParams field to the sqlite database though, but for now I have combined their data so that we don't lose backward compatibility, know a couple of people have been using the datastore already].
Now have a rough day/night cycle (the movement of the sun needs to be made smoother but for now it is better than we had I think). Added dalien's patch (issue 294) for saving and loading prims to a xml file (think he will be modifying these to be import/export functions and maybe writing a xml datastore for backups). Some preliminary work on task inventory (ie object's/prim's inventory). Added place holder data for AvatarProperties (ie a avatar's profile). Should we store this sort of data on the user server or have another server for it (a normal webserver should work). Added a few more method to IClientAPI. Sure there is something I'm forgeting.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/Application.cs2
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs24
2 files changed, 23 insertions, 3 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index f16aca8..5da699b 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -62,10 +62,8 @@ namespace OpenSim
62 ArgvConfigSource configSource = new ArgvConfigSource(args); 62 ArgvConfigSource configSource = new ArgvConfigSource(args);
63 63
64 configSource.AddSwitch("Startup", "inifile"); 64 configSource.AddSwitch("Startup", "inifile");
65 configSource.AddSwitch("Startup", "configfile");
66 configSource.AddSwitch("Startup", "gridmode"); 65 configSource.AddSwitch("Startup", "gridmode");
67 configSource.AddSwitch("Startup", "physics"); 66 configSource.AddSwitch("Startup", "physics");
68 configSource.AddSwitch("Startup", "config");
69 configSource.AddSwitch("Startup", "noverbose"); 67 configSource.AddSwitch("Startup", "noverbose");
70 68
71 OpenSimMain sim = new OpenSimMain(configSource); 69 OpenSimMain sim = new OpenSimMain(configSource);
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 3fc6662..327a3c2 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -340,6 +340,28 @@ namespace OpenSim
340 } 340 }
341 break; 341 break;
342 342
343 case "save-xml":
344 if (cmdparams.Length > 0)
345 {
346 m_localScenes[0].SavePrimsToXml(cmdparams[0]);
347 }
348 else
349 {
350 m_localScenes[0].SavePrimsToXml("test.xml");
351 }
352 break;
353
354 case "load-xml":
355 if (cmdparams.Length > 0)
356 {
357 m_localScenes[0].LoadPrimsFromXml(cmdparams[0]);
358 }
359 else
360 {
361 m_localScenes[0].LoadPrimsFromXml("test.xml");
362 }
363 break;
364
343 case "terrain": 365 case "terrain":
344 string result = ""; 366 string result = "";
345 foreach (Scene scene in m_localScenes) 367 foreach (Scene scene in m_localScenes)
@@ -357,7 +379,7 @@ namespace OpenSim
357 if (scene.RegionInfo.RegionName.ToLower() == cmdparams[0].ToLower()) 379 if (scene.RegionInfo.RegionName.ToLower() == cmdparams[0].ToLower())
358 { 380 {
359 string[] tmpCmdparams = new string[cmdparams.Length - 1]; 381 string[] tmpCmdparams = new string[cmdparams.Length - 1];
360 cmdparams.CopyTo(tmpCmdparams,1); 382 cmdparams.CopyTo(tmpCmdparams, 1);
361 383
362 if (!scene.Terrain.RunTerrainCmd(tmpCmdparams, ref result2, scene.RegionInfo.RegionName)) 384 if (!scene.Terrain.RunTerrainCmd(tmpCmdparams, ref result2, scene.RegionInfo.RegionName))
363 { 385 {