diff options
| author | Melanie | 2011-10-26 17:55:53 +0200 |
|---|---|---|
| committer | Melanie | 2011-10-26 17:55:53 +0200 |
| commit | c763419043773c93dbbc865ec35f7ecf856a641a (patch) | |
| tree | ac9f99c33ae788e6b7fdfd0843c2ae584a896dc6 /OpenSim/Framework/IScene.cs | |
| parent | Fix a missing locking call (diff) | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| download | opensim-SC-c763419043773c93dbbc865ec35f7ecf856a641a.zip opensim-SC-c763419043773c93dbbc865ec35f7ecf856a641a.tar.gz opensim-SC-c763419043773c93dbbc865ec35f7ecf856a641a.tar.bz2 opensim-SC-c763419043773c93dbbc865ec35f7ecf856a641a.tar.xz | |
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/IScene.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs index e0cb897..f1b4732 100644 --- a/OpenSim/Framework/IScene.cs +++ b/OpenSim/Framework/IScene.cs | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | using OpenMetaverse; | 28 | using OpenMetaverse; |
| 29 | using OpenSim.Framework.Console; | 29 | //using OpenSim.Framework.Console; |
| 30 | using Nini.Config; | 30 | using Nini.Config; |
| 31 | 31 | ||
| 32 | namespace OpenSim.Framework | 32 | namespace OpenSim.Framework |
| @@ -108,7 +108,7 @@ namespace OpenSim.Framework | |||
| 108 | void RegisterModuleInterface<M>(M mod); | 108 | void RegisterModuleInterface<M>(M mod); |
| 109 | void StackModuleInterface<M>(M mod); | 109 | void StackModuleInterface<M>(M mod); |
| 110 | 110 | ||
| 111 | void AddCommand(object module, string command, string shorthelp, string longhelp, CommandDelegate callback); | 111 | // void AddCommand(object module, string command, string shorthelp, string longhelp, CommandDelegate callback); |
| 112 | 112 | ||
| 113 | ISceneObject DeserializeObject(string representation); | 113 | ISceneObject DeserializeObject(string representation); |
| 114 | 114 | ||