aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSim.cs
diff options
context:
space:
mode:
authorJohn Hurliman2010-04-22 18:56:06 -0700
committerJohn Hurliman2010-04-22 18:56:06 -0700
commit8692ac53f56c8db9942021709e7415b2b2add0c6 (patch)
tree5681611d23f8f89b38d2c19ef032d412fd3fe3d2 /OpenSim/Region/Application/OpenSim.cs
parent* Better error logging for failed SimianGrid web service calls (diff)
parentInsert a ROLLBACK command on migration step failure. This ensures that (diff)
downloadopensim-SC_OLD-8692ac53f56c8db9942021709e7415b2b2add0c6.zip
opensim-SC_OLD-8692ac53f56c8db9942021709e7415b2b2add0c6.tar.gz
opensim-SC_OLD-8692ac53f56c8db9942021709e7415b2b2add0c6.tar.bz2
opensim-SC_OLD-8692ac53f56c8db9942021709e7415b2b2add0c6.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Application/OpenSim.cs')
-rw-r--r--[-rwxr-xr-x]OpenSim/Region/Application/OpenSim.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 38b2084..1395030 100755..100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -251,8 +251,9 @@ namespace OpenSim
251 "Save named prim to XML2", SavePrimsXml2); 251 "Save named prim to XML2", SavePrimsXml2);
252 252
253 m_console.Commands.AddCommand("region", false, "load oar", 253 m_console.Commands.AddCommand("region", false, "load oar",
254 "load oar [--merge] <oar name>", 254 "load oar [--merge] [--skip-assets] <oar name>",
255 "Load a region's data from OAR archive", LoadOar); 255 "Load a region's data from OAR archive. --merge will merge the oar with the existing scene. --skip-assets will load the oar but ignore the assets it contains",
256 LoadOar);
256 257
257 m_console.Commands.AddCommand("region", false, "save oar", 258 m_console.Commands.AddCommand("region", false, "save oar",
258 "save oar <oar name>", 259 "save oar <oar name>",