Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

author: Justin Clark-Casey (justincc) 2012-11-14 02:30:12 +0000
committer: Justin Clark-Casey (justincc) 2012-11-14 02:30:12 +0000
commit: 564fe35d4d88009f7ca9f7c1b8e3eafb13a2cc1c (patch)
tree: 1d046904229e0a6c36481c255ceb71eda7c72872 /OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
parent: Stop Prebuild from generating <copy> statements which unnecessarily copy file... (diff)
parent: Deleted OptionalModules.addin.xml. Added AssemblyInfo.cs for that dll. (diff)
download: opensim-SC_OLD-564fe35d4d88009f7ca9f7c1b8e3eafb13a2cc1c.zip
opensim-SC_OLD-564fe35d4d88009f7ca9f7c1b8e3eafb13a2cc1c.tar.gz
opensim-SC_OLD-564fe35d4d88009f7ca9f7c1b8e3eafb13a2cc1c.tar.bz2
opensim-SC_OLD-564fe35d4d88009f7ca9f7c1b8e3eafb13a2cc1c.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	Justin Clark-Casey (justincc)	2012-11-14 02:30:12 +0000
committer	Justin Clark-Casey (justincc)	2012-11-14 02:30:12 +0000
commit	564fe35d4d88009f7ca9f7c1b8e3eafb13a2cc1c (patch)
tree	1d046904229e0a6c36481c255ceb71eda7c72872 /OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
parent	Stop Prebuild from generating <copy> statements which unnecessarily copy file... (diff)
parent	Deleted OptionalModules.addin.xml. Added AssemblyInfo.cs for that dll. (diff)
download	opensim-SC_OLD-564fe35d4d88009f7ca9f7c1b8e3eafb13a2cc1c.zip opensim-SC_OLD-564fe35d4d88009f7ca9f7c1b8e3eafb13a2cc1c.tar.gz opensim-SC_OLD-564fe35d4d88009f7ca9f7c1b8e3eafb13a2cc1c.tar.bz2 opensim-SC_OLD-564fe35d4d88009f7ca9f7c1b8e3eafb13a2cc1c.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.