aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/General
diff options
context:
space:
mode:
authorlbsa712007-10-05 10:14:42 +0000
committerlbsa712007-10-05 10:14:42 +0000
commit5a6552120395611e66a88821ce848a06c9ea4720 (patch)
treed23780998986524b160ba97292022809efcff0bc /OpenSim/Framework/General
parent* ignored ScriptServer/bin (diff)
downloadopensim-SC_OLD-5a6552120395611e66a88821ce848a06c9ea4720.zip
opensim-SC_OLD-5a6552120395611e66a88821ce848a06c9ea4720.tar.gz
opensim-SC_OLD-5a6552120395611e66a88821ce848a06c9ea4720.tar.bz2
opensim-SC_OLD-5a6552120395611e66a88821ce848a06c9ea4720.tar.xz
== The "right name and place" commit ==
* Moved InventoryData to Framework.Types/InventoryItemBase.cs * Moved UserData to Framework.Interfaces/IUserData.cs * Moved UserProfileData to Framework/Types/UserProfileData.cs * Deleted ass-backwards Framework dependency on Framework.Data (now it's the other way round) * Changed some namespaces to reflect file structure
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/General/Interfaces/IClientAPI.cs1
-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.cs2
-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;
31using libsecondlife; 31using libsecondlife;
32using libsecondlife.Packets; 32using libsecondlife.Packets;
33using OpenSim.Framework.Types; 33using OpenSim.Framework.Types;
34using OpenSim.Framework.Data;
35 34
36namespace OpenSim.Framework.Interfaces 35namespace 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*/
28using libsecondlife; 28using libsecondlife;
29using OpenSim.Framework.Types;
29 30
30namespace OpenSim.Framework.Data 31namespace 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*/
28using libsecondlife; 28using libsecondlife;
29using OpenSim.Framework.Data; 29using OpenSim.Framework.Types;
30 30
31namespace OpenSim.Framework.Interfaces 31namespace 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 @@
28using System.Collections.Generic; 28using System.Collections.Generic;
29using libsecondlife; 29using libsecondlife;
30 30
31namespace OpenSim.Framework.Data 31namespace 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 @@
28using System; 28using System;
29using libsecondlife; 29using libsecondlife;
30 30
31namespace OpenSim.Framework.Data 31namespace 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