Merge branch 'master' into bulletsim

author: Dan Lake 2011-07-11 12:23:20 -0700
committer: Dan Lake 2011-07-11 12:23:20 -0700
commit: b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a (patch)
tree: 8fd2fa4567e2882e7f5dafdb8cf1de571917f23a /OpenSim/Region/Framework/Interfaces/INPCModule.cs
parent: Checkin 32 bit bulletsim shared library for Linux. (diff)
parent: minor Tack the prim name on the end of the "experimental mesh proxy generatio... (diff)
download: opensim-SC_OLD-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.zip
opensim-SC_OLD-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.tar.gz
opensim-SC_OLD-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.tar.bz2
opensim-SC_OLD-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/NPC/INPCModule.cs b/OpenSim/Region/Framework/Interfaces/INPCModule.cs
index cd2fe4f..21a755f 100644
--- a/OpenSim/Region/CoreModules/Avatar/NPC/INPCModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/INPCModule.cs
@@ -28,7 +28,7 @@
 using OpenMetaverse;
 using OpenSim.Region.Framework.Scenes;
-namespace OpenSim.Region.CoreModules.Avatar.NPC
+namespace OpenSim.Region.Framework.Interfaces
 {
    public interface INPCModule
    {
author	Dan Lake	2011-07-11 12:23:20 -0700
committer	Dan Lake	2011-07-11 12:23:20 -0700
commit	b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a (patch)
tree	8fd2fa4567e2882e7f5dafdb8cf1de571917f23a /OpenSim/Region/Framework/Interfaces/INPCModule.cs
parent	Checkin 32 bit bulletsim shared library for Linux. (diff)
parent	minor Tack the prim name on the end of the "experimental mesh proxy generatio... (diff)
download	opensim-SC_OLD-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.zip opensim-SC_OLD-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.tar.gz opensim-SC_OLD-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.tar.bz2 opensim-SC_OLD-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.tar.xz

diff --git a/OpenSim/Region/CoreModules/Avatar/NPC/INPCModule.cs b/OpenSim/Region/Framework/Interfaces/INPCModule.cs index cd2fe4f..21a755f 100644 --- a/OpenSim/Region/CoreModules/Avatar/NPC/INPCModule.cs +++ b/OpenSim/Region/Framework/Interfaces/INPCModule.cs
@@ -28,7 +28,7 @@
28	using OpenMetaverse;	28	using OpenMetaverse;
29	using OpenSim.Region.Framework.Scenes;	29	using OpenSim.Region.Framework.Scenes;
30		30
31	namespace OpenSim.Region.CoreModules.Avatar.NPC	31	namespace OpenSim.Region.Framework.Interfaces
32	{	32	{
33	public interface INPCModule	33	public interface INPCModule
34	{	34	{