aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-05-28 20:07:15 +0100
committerJustin Clark-Casey (justincc)2010-05-28 20:07:15 +0100
commitfff5459f4d3a6fcb7acae9e092fd8aae3c74dd7b (patch)
tree98082d9eaedf0745b912be891eee52d2e684ef22 /OpenSim/Region/Framework/Scenes
parentminor: remove mono compiler warning (diff)
downloadopensim-SC-fff5459f4d3a6fcb7acae9e092fd8aae3c74dd7b.zip
opensim-SC-fff5459f4d3a6fcb7acae9e092fd8aae3c74dd7b.tar.gz
opensim-SC-fff5459f4d3a6fcb7acae9e092fd8aae3c74dd7b.tar.bz2
opensim-SC-fff5459f4d3a6fcb7acae9e092fd8aae3c74dd7b.tar.xz
Add ability to load IARs directly from URIs
So, something like load iar Justin Clark-Casey / PASSWORD http://justincc.org/downloads/iars/my-great-items.iar Will load my IAR directly from the web.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneBase.cs26
1 files changed, 25 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index bfc19b7..c363a91 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -498,8 +498,31 @@ namespace OpenSim.Region.Framework.Scenes
498 } 498 }
499 } 499 }
500 500
501 /// <summary>
502 /// Call this from a region module to add a command to the OpenSim console.
503 /// </summary>
504 /// <param name="mod"></param>
505 /// <param name="command"></param>
506 /// <param name="shorthelp"></param>
507 /// <param name="longhelp"></param>
508 /// <param name="callback"></param>
501 public void AddCommand(object mod, string command, string shorthelp, string longhelp, CommandDelegate callback) 509 public void AddCommand(object mod, string command, string shorthelp, string longhelp, CommandDelegate callback)
502 { 510 {
511 AddCommand(mod, command, shorthelp, longhelp, string.Empty, callback);
512 }
513
514 /// <summary>
515 /// Call this from a region module to add a command to the OpenSim console.
516 /// </summary>
517 /// <param name="mod"></param>
518 /// <param name="command"></param>
519 /// <param name="shorthelp"></param>
520 /// <param name="longhelp"></param>
521 /// <param name="descriptivehelp"></param>
522 /// <param name="callback"></param>
523 public void AddCommand(
524 object mod, string command, string shorthelp, string longhelp, string descriptivehelp, CommandDelegate callback)
525 {
503 if (MainConsole.Instance == null) 526 if (MainConsole.Instance == null)
504 return; 527 return;
505 528
@@ -523,7 +546,8 @@ namespace OpenSim.Region.Framework.Scenes
523 else throw new Exception("AddCommand module parameter must be IRegionModule or IRegionModuleBase"); 546 else throw new Exception("AddCommand module parameter must be IRegionModule or IRegionModuleBase");
524 } 547 }
525 548
526 MainConsole.Instance.Commands.AddCommand(modulename, shared, command, shorthelp, longhelp, callback); 549 MainConsole.Instance.Commands.AddCommand(
550 modulename, shared, command, shorthelp, longhelp, descriptivehelp, callback);
527 } 551 }
528 552
529 public virtual ISceneObject DeserializeObject(string representation) 553 public virtual ISceneObject DeserializeObject(string representation)