Merge branch 'master' into careminster-presence-refactor

author: root 2011-07-05 04:01:59 +0100
committer: root 2011-07-05 04:01:59 +0100
commit: 47cf9c8fe060af89cc14817dc762bcbfef956d5e (patch)
tree: 56b21e617bbb4ce3a613780c81178de41ff062d3 /OpenSim/Region/ScriptEngine/Shared
parent: Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
parent: Add TestClearCache() (diff)
download: opensim-SC_OLD-47cf9c8fe060af89cc14817dc762bcbfef956d5e.zip
opensim-SC_OLD-47cf9c8fe060af89cc14817dc762bcbfef956d5e.tar.gz
opensim-SC_OLD-47cf9c8fe060af89cc14817dc762bcbfef956d5e.tar.bz2
opensim-SC_OLD-47cf9c8fe060af89cc14817dc762bcbfef956d5e.tar.xz
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 2b8155f..31222ff 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -38,7 +38,6 @@ using OpenSim;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
-using OpenSim.Region.CoreModules.Avatar.NPC;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.ScriptEngine.Shared;
author	root	2011-07-05 04:01:59 +0100
committer	root	2011-07-05 04:01:59 +0100
commit	47cf9c8fe060af89cc14817dc762bcbfef956d5e (patch)
tree	56b21e617bbb4ce3a613780c81178de41ff062d3 /OpenSim/Region/ScriptEngine/Shared
parent	Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
parent	Add TestClearCache() (diff)
download	opensim-SC_OLD-47cf9c8fe060af89cc14817dc762bcbfef956d5e.zip opensim-SC_OLD-47cf9c8fe060af89cc14817dc762bcbfef956d5e.tar.gz opensim-SC_OLD-47cf9c8fe060af89cc14817dc762bcbfef956d5e.tar.bz2 opensim-SC_OLD-47cf9c8fe060af89cc14817dc762bcbfef956d5e.tar.xz

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 2b8155f..31222ff 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -38,7 +38,6 @@ using OpenSim;
38	using OpenSim.Framework;	38	using OpenSim.Framework;
39		39
40	using OpenSim.Framework.Console;	40	using OpenSim.Framework.Console;
41	using OpenSim.Region.CoreModules.Avatar.NPC;
42	using OpenSim.Region.Framework.Interfaces;	41	using OpenSim.Region.Framework.Interfaces;
43	using OpenSim.Region.Framework.Scenes;	42	using OpenSim.Region.Framework.Scenes;
44	using OpenSim.Region.ScriptEngine.Shared;	43	using OpenSim.Region.ScriptEngine.Shared;