diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/General/Interfaces/IClientAPI.cs | 1 | ||||
-rw-r--r-- | OpenSim/Framework/General/Interfaces/IUserData.cs (renamed from OpenSim/Framework/Data/UserData.cs) | 1 | ||||
-rw-r--r-- | OpenSim/Framework/General/Interfaces/IUserService.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/General/Types/InventoryItemBase.cs (renamed from OpenSim/Framework/Data/InventoryData.cs) | 4 | ||||
-rw-r--r-- | OpenSim/Framework/General/Types/UserProfileData.cs (renamed from OpenSim/Framework/Data/UserProfileData.cs) | 5 |
5 files changed, 6 insertions, 7 deletions
diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs index 344a55c..bedea9e 100644 --- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs +++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs | |||
@@ -31,7 +31,6 @@ using System.Net; | |||
31 | using libsecondlife; | 31 | using libsecondlife; |
32 | using libsecondlife.Packets; | 32 | using libsecondlife.Packets; |
33 | using OpenSim.Framework.Types; | 33 | using OpenSim.Framework.Types; |
34 | using OpenSim.Framework.Data; | ||
35 | 34 | ||
36 | namespace OpenSim.Framework.Interfaces | 35 | namespace OpenSim.Framework.Interfaces |
37 | { | 36 | { |
diff --git a/OpenSim/Framework/Data/UserData.cs b/OpenSim/Framework/General/Interfaces/IUserData.cs index 13bdf17..bb3abe0 100644 --- a/OpenSim/Framework/Data/UserData.cs +++ b/OpenSim/Framework/General/Interfaces/IUserData.cs | |||
@@ -26,6 +26,7 @@ | |||
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | using libsecondlife; | 28 | using libsecondlife; |
29 | using OpenSim.Framework.Types; | ||
29 | 30 | ||
30 | namespace OpenSim.Framework.Data | 31 | namespace OpenSim.Framework.Data |
31 | { | 32 | { |
diff --git a/OpenSim/Framework/General/Interfaces/IUserService.cs b/OpenSim/Framework/General/Interfaces/IUserService.cs index 974e025..461d4cb 100644 --- a/OpenSim/Framework/General/Interfaces/IUserService.cs +++ b/OpenSim/Framework/General/Interfaces/IUserService.cs | |||
@@ -26,7 +26,7 @@ | |||
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | using libsecondlife; | 28 | using libsecondlife; |
29 | using OpenSim.Framework.Data; | 29 | using OpenSim.Framework.Types; |
30 | 30 | ||
31 | namespace OpenSim.Framework.Interfaces | 31 | namespace OpenSim.Framework.Interfaces |
32 | { | 32 | { |
diff --git a/OpenSim/Framework/Data/InventoryData.cs b/OpenSim/Framework/General/Types/InventoryItemBase.cs index 2df26e1..e3dbe71 100644 --- a/OpenSim/Framework/Data/InventoryData.cs +++ b/OpenSim/Framework/General/Types/InventoryItemBase.cs | |||
@@ -28,7 +28,7 @@ | |||
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using libsecondlife; | 29 | using libsecondlife; |
30 | 30 | ||
31 | namespace OpenSim.Framework.Data | 31 | namespace OpenSim.Framework.Types |
32 | { | 32 | { |
33 | /// <summary> | 33 | /// <summary> |
34 | /// Inventory Item - contains all the properties associated with an individual inventory piece. | 34 | /// Inventory Item - contains all the properties associated with an individual inventory piece. |
@@ -219,4 +219,4 @@ namespace OpenSim.Framework.Data | |||
219 | /// <param name="folder">The inventory folder</param> | 219 | /// <param name="folder">The inventory folder</param> |
220 | void updateInventoryFolder(InventoryFolderBase folder); | 220 | void updateInventoryFolder(InventoryFolderBase folder); |
221 | } | 221 | } |
222 | } | 222 | } \ No newline at end of file |
diff --git a/OpenSim/Framework/Data/UserProfileData.cs b/OpenSim/Framework/General/Types/UserProfileData.cs index 4fafe3f..20d8224 100644 --- a/OpenSim/Framework/Data/UserProfileData.cs +++ b/OpenSim/Framework/General/Types/UserProfileData.cs | |||
@@ -28,7 +28,7 @@ | |||
28 | using System; | 28 | using System; |
29 | using libsecondlife; | 29 | using libsecondlife; |
30 | 30 | ||
31 | namespace OpenSim.Framework.Data | 31 | namespace OpenSim.Framework.Types |
32 | { | 32 | { |
33 | /// <summary> | 33 | /// <summary> |
34 | /// Information about a particular user known to the userserver | 34 | /// Information about a particular user known to the userserver |
@@ -68,7 +68,6 @@ namespace OpenSim.Framework.Data | |||
68 | set { | 68 | set { |
69 | homeRegionX = (uint)(value >> 40); | 69 | homeRegionX = (uint)(value >> 40); |
70 | homeRegionY = (((uint)(value)) >> 8); | 70 | homeRegionY = (((uint)(value)) >> 8); |
71 | Console.WriteLine("HomeRegion => Incoming: " + value + ", Computed: " + homeRegion); | ||
72 | } | 71 | } |
73 | } | 72 | } |
74 | public uint homeRegionX; | 73 | public uint homeRegionX; |
@@ -189,4 +188,4 @@ namespace OpenSim.Framework.Data | |||
189 | /// </summary> | 188 | /// </summary> |
190 | public LLVector3 currentPos; | 189 | public LLVector3 currentPos; |
191 | } | 190 | } |
192 | } | 191 | } \ No newline at end of file |