aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Base
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-12-08 01:37:10 +0000
committerJustin Clark-Casey (justincc)2012-12-08 01:37:10 +0000
commit8de9f9dd4add219b072291c04ff55eb493d59ecf (patch)
tree772ece66adb36a7ce19dc64d7043878ee4851000 /OpenSim/Server/Base
parentRe-enable code disabled in f605a62 to allow a TaskInventoryAccepted message t... (diff)
parentFormat change (diff)
downloadopensim-SC_OLD-8de9f9dd4add219b072291c04ff55eb493d59ecf.zip
opensim-SC_OLD-8de9f9dd4add219b072291c04ff55eb493d59ecf.tar.gz
opensim-SC_OLD-8de9f9dd4add219b072291c04ff55eb493d59ecf.tar.bz2
opensim-SC_OLD-8de9f9dd4add219b072291c04ff55eb493d59ecf.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r--OpenSim/Server/Base/CommandManager.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Server/Base/CommandManager.cs b/OpenSim/Server/Base/CommandManager.cs
index 88aac00..bd18485 100644
--- a/OpenSim/Server/Base/CommandManager.cs
+++ b/OpenSim/Server/Base/CommandManager.cs
@@ -32,8 +32,8 @@ using System.Linq;
32using System.Collections; 32using System.Collections;
33using System.Collections.Generic; 33using System.Collections.Generic;
34using System.Collections.ObjectModel; 34using System.Collections.ObjectModel;
35using Mono.Addins.Setup;
35using Mono.Addins; 36using Mono.Addins;
36// using Mono.Addins.Setup;
37using Mono.Addins.Description; 37using Mono.Addins.Description;
38using OpenSim.Framework; 38using OpenSim.Framework;
39 39