Merge branch 'master' into connector_plugin

Conflicts: OpenSim/Server/Base/ServicesServerBase.cs
author: BlueWall 2012-11-25 17:03:14 -0500
committer: BlueWall 2012-11-25 17:03:14 -0500
commit: c754003944d0166bf50b4f94b0c0eea642503bb0 (patch)
tree: dfa1c2020d5500d510519d5b2b3236600692f277 /OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
parent: Merge branch 'master' into connector_plugin (diff)
parent: Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ... (diff)
download: opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.zip
opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.gz
opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.bz2
opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
index 5fe5948..992f38e 100644
--- a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
+++ b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
@@ -40,7 +40,7 @@ using OpenSim.Region.ClientStack.LindenUDP;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-namespace OpenSim.Region.CoreModules.UDP.Linden
+namespace OpenSim.Region.OptionalModules.UDP.Linden
 {
    /// <summary>
    /// A module that just holds commands for inspecting the current state of the Linden UDP stack.
author	BlueWall	2012-11-25 17:03:14 -0500
committer	BlueWall	2012-11-25 17:03:14 -0500
commit	c754003944d0166bf50b4f94b0c0eea642503bb0 (patch)
tree	dfa1c2020d5500d510519d5b2b3236600692f277 /OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
parent	Merge branch 'master' into connector_plugin (diff)
parent	Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ... (diff)
download	opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.zip opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.gz opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.bz2 opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.xz

diff --git a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs index 5fe5948..992f38e 100644 --- a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs +++ b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
@@ -40,7 +40,7 @@ using OpenSim.Region.ClientStack.LindenUDP;
40	using OpenSim.Region.Framework.Interfaces;	40	using OpenSim.Region.Framework.Interfaces;
41	using OpenSim.Region.Framework.Scenes;	41	using OpenSim.Region.Framework.Scenes;
42		42
43	namespace OpenSim.Region.CoreModules.UDP.Linden	43	namespace OpenSim.Region.OptionalModules.UDP.Linden
44	{	44	{
45	/// <summary>	45	/// <summary>
46	/// A module that just holds commands for inspecting the current state of the Linden UDP stack.	46	/// A module that just holds commands for inspecting the current state of the Linden UDP stack.