Merge branch 'master' into bigmerge

Conflicts: OpenSim/Framework/Watchdog.cs
author: Melanie 2011-10-26 01:27:24 +0100
committer: Melanie 2011-10-26 01:27:24 +0100
commit: fd22159d0c7d7b149d35747cbaa436f3b1e6f579 (patch)
tree: bbe8cdc63dd1f98346a6afb844f4b4d3caf336a8 /OpenSim/Framework/IScene.cs
parent: Merge commit 'e14cb45b9bc4c78300cb804833cb66c1c2e62187' into bigmerge (diff)
parent: Restart the event queue worker threads that I accidentally disabled earlier t... (diff)
download: opensim-SC-fd22159d0c7d7b149d35747cbaa436f3b1e6f579.zip
opensim-SC-fd22159d0c7d7b149d35747cbaa436f3b1e6f579.tar.gz
opensim-SC-fd22159d0c7d7b149d35747cbaa436f3b1e6f579.tar.bz2
opensim-SC-fd22159d0c7d7b149d35747cbaa436f3b1e6f579.tar.xz
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 @@
 */
 using OpenMetaverse;
-using OpenSim.Framework.Console;
+//using OpenSim.Framework.Console;
 using Nini.Config;
 namespace OpenSim.Framework
@@ -108,7 +108,7 @@ namespace OpenSim.Framework
        void RegisterModuleInterface<M>(M mod);
        void StackModuleInterface<M>(M mod);
-        void AddCommand(object module, string command, string shorthelp, string longhelp, CommandDelegate callback);
+//        void AddCommand(object module, string command, string shorthelp, string longhelp, CommandDelegate callback);
        ISceneObject DeserializeObject(string representation);
author	Melanie	2011-10-26 01:27:24 +0100
committer	Melanie	2011-10-26 01:27:24 +0100
commit	fd22159d0c7d7b149d35747cbaa436f3b1e6f579 (patch)
tree	bbe8cdc63dd1f98346a6afb844f4b4d3caf336a8 /OpenSim/Framework/IScene.cs
parent	Merge commit 'e14cb45b9bc4c78300cb804833cb66c1c2e62187' into bigmerge (diff)
parent	Restart the event queue worker threads that I accidentally disabled earlier t... (diff)
download	opensim-SC-fd22159d0c7d7b149d35747cbaa436f3b1e6f579.zip opensim-SC-fd22159d0c7d7b149d35747cbaa436f3b1e6f579.tar.gz opensim-SC-fd22159d0c7d7b149d35747cbaa436f3b1e6f579.tar.bz2 opensim-SC-fd22159d0c7d7b149d35747cbaa436f3b1e6f579.tar.xz

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