diff options
Diffstat (limited to 'OpenSim/Framework/Data')
-rw-r--r-- | OpenSim/Framework/Data/GridData.cs | 8 | ||||
-rw-r--r-- | OpenSim/Framework/Data/ILogData.cs | 4 | ||||
-rw-r--r-- | OpenSim/Framework/Data/IniConfig.cs | 4 | ||||
-rw-r--r-- | OpenSim/Framework/Data/InventoryData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/Data/Properties/AssemblyInfo.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/Data/ReservationData.cs | 4 | ||||
-rw-r--r-- | OpenSim/Framework/Data/SimProfileData.cs | 8 | ||||
-rw-r--r-- | OpenSim/Framework/Data/UserData.cs | 3 | ||||
-rw-r--r-- | OpenSim/Framework/Data/UserProfileData.cs | 2 |
9 files changed, 6 insertions, 31 deletions
diff --git a/OpenSim/Framework/Data/GridData.cs b/OpenSim/Framework/Data/GridData.cs index 7f8fdaf..5a17d20 100644 --- a/OpenSim/Framework/Data/GridData.cs +++ b/OpenSim/Framework/Data/GridData.cs | |||
@@ -25,9 +25,7 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | using System; | 28 | using libsecondlife; |
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | 29 | ||
32 | namespace OpenSim.Framework.Data | 30 | namespace OpenSim.Framework.Data |
33 | { | 31 | { |
@@ -56,7 +54,7 @@ namespace OpenSim.Framework.Data | |||
56 | /// </summary> | 54 | /// </summary> |
57 | /// <param name="UUID">A 128bit UUID</param> | 55 | /// <param name="UUID">A 128bit UUID</param> |
58 | /// <returns>A sim profile</returns> | 56 | /// <returns>A sim profile</returns> |
59 | SimProfileData GetProfileByLLUUID(libsecondlife.LLUUID UUID); | 57 | SimProfileData GetProfileByLLUUID(LLUUID UUID); |
60 | 58 | ||
61 | /// <summary> | 59 | /// <summary> |
62 | /// Returns all profiles within the specified range | 60 | /// Returns all profiles within the specified range |
@@ -76,7 +74,7 @@ namespace OpenSim.Framework.Data | |||
76 | /// <param name="regionHandle">The regionhandle sent by the sim</param> | 74 | /// <param name="regionHandle">The regionhandle sent by the sim</param> |
77 | /// <param name="simrecvkey">The recieving key sent by the sim</param> | 75 | /// <param name="simrecvkey">The recieving key sent by the sim</param> |
78 | /// <returns>Whether the sim has been authenticated</returns> | 76 | /// <returns>Whether the sim has been authenticated</returns> |
79 | bool AuthenticateSim(libsecondlife.LLUUID UUID, ulong regionHandle, string simrecvkey); | 77 | bool AuthenticateSim(LLUUID UUID, ulong regionHandle, string simrecvkey); |
80 | 78 | ||
81 | /// <summary> | 79 | /// <summary> |
82 | /// Initialises the interface | 80 | /// Initialises the interface |
diff --git a/OpenSim/Framework/Data/ILogData.cs b/OpenSim/Framework/Data/ILogData.cs index ccb3b84..059fef5 100644 --- a/OpenSim/Framework/Data/ILogData.cs +++ b/OpenSim/Framework/Data/ILogData.cs | |||
@@ -25,10 +25,6 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | |||
32 | namespace OpenSim.Framework.Data | 28 | namespace OpenSim.Framework.Data |
33 | { | 29 | { |
34 | /// <summary> | 30 | /// <summary> |
diff --git a/OpenSim/Framework/Data/IniConfig.cs b/OpenSim/Framework/Data/IniConfig.cs index 2f002c1..2b52fd1 100644 --- a/OpenSim/Framework/Data/IniConfig.cs +++ b/OpenSim/Framework/Data/IniConfig.cs | |||
@@ -25,12 +25,8 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | using System.IO; | 28 | using System.IO; |
32 | using System.Text.RegularExpressions; | 29 | using System.Text.RegularExpressions; |
33 | |||
34 | /* | 30 | /* |
35 | Taken from public code listing at by Alex Pinsker | 31 | Taken from public code listing at by Alex Pinsker |
36 | http://alexpinsker.blogspot.com/2005/12/reading-ini-file-from-c_113432097333021549.html | 32 | http://alexpinsker.blogspot.com/2005/12/reading-ini-file-from-c_113432097333021549.html |
diff --git a/OpenSim/Framework/Data/InventoryData.cs b/OpenSim/Framework/Data/InventoryData.cs index 8a3a664..c2a1d06 100644 --- a/OpenSim/Framework/Data/InventoryData.cs +++ b/OpenSim/Framework/Data/InventoryData.cs | |||
@@ -25,9 +25,7 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | using System; | ||
29 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
30 | using System.Text; | ||
31 | using libsecondlife; | 29 | using libsecondlife; |
32 | 30 | ||
33 | namespace OpenSim.Framework.Data | 31 | namespace OpenSim.Framework.Data |
diff --git a/OpenSim/Framework/Data/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data/Properties/AssemblyInfo.cs index 7d749d5..f9260a1 100644 --- a/OpenSim/Framework/Data/Properties/AssemblyInfo.cs +++ b/OpenSim/Framework/Data/Properties/AssemblyInfo.cs | |||
@@ -1,7 +1,5 @@ | |||
1 | using System.Reflection; | 1 | using System.Reflection; |
2 | using System.Runtime.CompilerServices; | ||
3 | using System.Runtime.InteropServices; | 2 | using System.Runtime.InteropServices; |
4 | |||
5 | // General Information about an assembly is controlled through the following | 3 | // General Information about an assembly is controlled through the following |
6 | // set of attributes. Change these attribute values to modify the information | 4 | // set of attributes. Change these attribute values to modify the information |
7 | // associated with an assembly. | 5 | // associated with an assembly. |
diff --git a/OpenSim/Framework/Data/ReservationData.cs b/OpenSim/Framework/Data/ReservationData.cs index f404ebd..0078df0 100644 --- a/OpenSim/Framework/Data/ReservationData.cs +++ b/OpenSim/Framework/Data/ReservationData.cs | |||
@@ -25,10 +25,6 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | |||
32 | using libsecondlife; | 28 | using libsecondlife; |
33 | 29 | ||
34 | namespace OpenSim.Framework.Data | 30 | namespace OpenSim.Framework.Data |
diff --git a/OpenSim/Framework/Data/SimProfileData.cs b/OpenSim/Framework/Data/SimProfileData.cs index 201aa01..3dddfb4 100644 --- a/OpenSim/Framework/Data/SimProfileData.cs +++ b/OpenSim/Framework/Data/SimProfileData.cs | |||
@@ -25,9 +25,7 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | using System; | 28 | using libsecondlife; |
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | 29 | ||
32 | namespace OpenSim.Framework.Data | 30 | namespace OpenSim.Framework.Data |
33 | { | 31 | { |
@@ -49,7 +47,7 @@ namespace OpenSim.Framework.Data | |||
49 | /// <summary> | 47 | /// <summary> |
50 | /// OGS/OpenSim Specific ID for a region | 48 | /// OGS/OpenSim Specific ID for a region |
51 | /// </summary> | 49 | /// </summary> |
52 | public libsecondlife.LLUUID UUID; | 50 | public LLUUID UUID; |
53 | 51 | ||
54 | /// <summary> | 52 | /// <summary> |
55 | /// Coordinates of the region | 53 | /// Coordinates of the region |
@@ -109,6 +107,6 @@ namespace OpenSim.Framework.Data | |||
109 | /// <summary> | 107 | /// <summary> |
110 | /// Region Map Texture Asset | 108 | /// Region Map Texture Asset |
111 | /// </summary> | 109 | /// </summary> |
112 | public libsecondlife.LLUUID regionMapTextureID = new libsecondlife.LLUUID("00000000-0000-0000-9999-000000000006"); | 110 | public LLUUID regionMapTextureID = new LLUUID("00000000-0000-0000-9999-000000000006"); |
113 | } | 111 | } |
114 | } | 112 | } |
diff --git a/OpenSim/Framework/Data/UserData.cs b/OpenSim/Framework/Data/UserData.cs index 2e15b47..c65f9fd 100644 --- a/OpenSim/Framework/Data/UserData.cs +++ b/OpenSim/Framework/Data/UserData.cs | |||
@@ -25,9 +25,6 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | using libsecondlife; | 28 | using libsecondlife; |
32 | 29 | ||
33 | namespace OpenSim.Framework.Data | 30 | namespace OpenSim.Framework.Data |
diff --git a/OpenSim/Framework/Data/UserProfileData.cs b/OpenSim/Framework/Data/UserProfileData.cs index ac168e0..bb7d48c 100644 --- a/OpenSim/Framework/Data/UserProfileData.cs +++ b/OpenSim/Framework/Data/UserProfileData.cs | |||
@@ -26,8 +26,6 @@ | |||
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | using libsecondlife; | 29 | using libsecondlife; |
32 | 30 | ||
33 | namespace OpenSim.Framework.Data | 31 | namespace OpenSim.Framework.Data |