aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorubit2012-07-16 00:46:22 +0200
committerubit2012-07-16 00:46:22 +0200
commitd3d877ceca0a697e03e12dd53277c83b049c740e (patch)
treee67020efd469d648c6c3ad28a1585bf9aad47025 /OpenSim/Region
parent merge fix (diff)
parentbackkick git (diff)
downloadopensim-SC-d3d877ceca0a697e03e12dd53277c83b049c740e.zip
opensim-SC-d3d877ceca0a697e03e12dd53277c83b049c740e.tar.gz
opensim-SC-d3d877ceca0a697e03e12dd53277c83b049c740e.tar.bz2
opensim-SC-d3d877ceca0a697e03e12dd53277c83b049c740e.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs1
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index a7740b9..0831946 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -25,7 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28
29using System; 28using System;
30using System.Collections.Generic; 29using System.Collections.Generic;
31using System.Diagnostics; 30using System.Diagnostics;