aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMW2007-08-01 18:04:31 +0000
committerMW2007-08-01 18:04:31 +0000
commitcdd1285e9ef2af6196d53941efcad4626624cabc (patch)
treed8b46ddf0ea7401808e642385888ef1cd94432f6 /OpenSim/Framework
parentSome more work on SceneObject/primitive rewrites (AllNewSceneObjectGroup2 /Pa... (diff)
downloadopensim-SC_OLD-cdd1285e9ef2af6196d53941efcad4626624cabc.zip
opensim-SC_OLD-cdd1285e9ef2af6196d53941efcad4626624cabc.tar.gz
opensim-SC_OLD-cdd1285e9ef2af6196d53941efcad4626624cabc.tar.bz2
opensim-SC_OLD-cdd1285e9ef2af6196d53941efcad4626624cabc.tar.xz
few small changes.
Updated libsl to latest version.
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Communications/IInventoryServices.cs1
-rw-r--r--OpenSim/Framework/UserManager/UserManagerBase.cs1
2 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Framework/Communications/IInventoryServices.cs b/OpenSim/Framework/Communications/IInventoryServices.cs
index 807952c..b78cba1 100644
--- a/OpenSim/Framework/Communications/IInventoryServices.cs
+++ b/OpenSim/Framework/Communications/IInventoryServices.cs
@@ -4,6 +4,7 @@ using System.Text;
4using OpenSim.Framework.Data; 4using OpenSim.Framework.Data;
5using libsecondlife; 5using libsecondlife;
6using OpenSim.Framework.Communications.Caches; 6using OpenSim.Framework.Communications.Caches;
7using InventoryFolder = OpenSim.Framework.Communications.Caches.InventoryFolder;
7 8
8namespace OpenSim.Framework.Communications 9namespace OpenSim.Framework.Communications
9{ 10{
diff --git a/OpenSim/Framework/UserManager/UserManagerBase.cs b/OpenSim/Framework/UserManager/UserManagerBase.cs
index 61b5df4..41744bd 100644
--- a/OpenSim/Framework/UserManager/UserManagerBase.cs
+++ b/OpenSim/Framework/UserManager/UserManagerBase.cs
@@ -39,6 +39,7 @@ using OpenSim.Framework.Inventory;
39using OpenSim.Framework.Utilities; 39using OpenSim.Framework.Utilities;
40 40
41using OpenSim.Framework.Configuration; 41using OpenSim.Framework.Configuration;
42using InventoryFolder = OpenSim.Framework.Inventory.InventoryFolder;
42 43
43namespace OpenSim.Framework.UserManagement 44namespace OpenSim.Framework.UserManagement
44{ 45{