diff options
author | MW | 2007-08-01 18:04:31 +0000 |
---|---|---|
committer | MW | 2007-08-01 18:04:31 +0000 |
commit | cdd1285e9ef2af6196d53941efcad4626624cabc (patch) | |
tree | d8b46ddf0ea7401808e642385888ef1cd94432f6 /OpenSim/Framework | |
parent | Some more work on SceneObject/primitive rewrites (AllNewSceneObjectGroup2 /Pa... (diff) | |
download | opensim-SC-cdd1285e9ef2af6196d53941efcad4626624cabc.zip opensim-SC-cdd1285e9ef2af6196d53941efcad4626624cabc.tar.gz opensim-SC-cdd1285e9ef2af6196d53941efcad4626624cabc.tar.bz2 opensim-SC-cdd1285e9ef2af6196d53941efcad4626624cabc.tar.xz |
few small changes.
Updated libsl to latest version.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Communications/IInventoryServices.cs | 1 | ||||
-rw-r--r-- | OpenSim/Framework/UserManager/UserManagerBase.cs | 1 |
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; | |||
4 | using OpenSim.Framework.Data; | 4 | using OpenSim.Framework.Data; |
5 | using libsecondlife; | 5 | using libsecondlife; |
6 | using OpenSim.Framework.Communications.Caches; | 6 | using OpenSim.Framework.Communications.Caches; |
7 | using InventoryFolder = OpenSim.Framework.Communications.Caches.InventoryFolder; | ||
7 | 8 | ||
8 | namespace OpenSim.Framework.Communications | 9 | namespace 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; | |||
39 | using OpenSim.Framework.Utilities; | 39 | using OpenSim.Framework.Utilities; |
40 | 40 | ||
41 | using OpenSim.Framework.Configuration; | 41 | using OpenSim.Framework.Configuration; |
42 | using InventoryFolder = OpenSim.Framework.Inventory.InventoryFolder; | ||
42 | 43 | ||
43 | namespace OpenSim.Framework.UserManagement | 44 | namespace OpenSim.Framework.UserManagement |
44 | { | 45 | { |