aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJeff Ames2008-03-29 04:25:52 +0000
committerJeff Ames2008-03-29 04:25:52 +0000
commitbf7ef8c41a24ead7e9cd0cc44f6e5001127ac9d1 (patch)
tree96af0354a4f9afc1719df66ca49cd77296472d60
parent* Refactored out common http handler operations (diff)
downloadopensim-SC_OLD-bf7ef8c41a24ead7e9cd0cc44f6e5001127ac9d1.zip
opensim-SC_OLD-bf7ef8c41a24ead7e9cd0cc44f6e5001127ac9d1.tar.gz
opensim-SC_OLD-bf7ef8c41a24ead7e9cd0cc44f6e5001127ac9d1.tar.bz2
opensim-SC_OLD-bf7ef8c41a24ead7e9cd0cc44f6e5001127ac9d1.tar.xz
Set svn:eol-style.
-rw-r--r--OpenSim/Framework/AvatarPickerAvatar.cs28
-rw-r--r--OpenSim/Framework/Data.MapperFactory/DataMapperFactory.cs52
-rw-r--r--OpenSim/Framework/Data/AssetDataBase.cs40
-rw-r--r--OpenSim/Framework/Data/DataStoreBase.cs20
-rw-r--r--OpenSim/Framework/Data/GridDataBase.cs44
-rw-r--r--OpenSim/Framework/Data/InventoryDataBase.cs20
-rw-r--r--OpenSim/Framework/Data/UserDataBase.cs58
7 files changed, 131 insertions, 131 deletions
diff --git a/OpenSim/Framework/AvatarPickerAvatar.cs b/OpenSim/Framework/AvatarPickerAvatar.cs
index 5f0de38..79c3301 100644
--- a/OpenSim/Framework/AvatarPickerAvatar.cs
+++ b/OpenSim/Framework/AvatarPickerAvatar.cs
@@ -1,14 +1,14 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using libsecondlife; 4using libsecondlife;
5 5
6namespace OpenSim.Framework 6namespace OpenSim.Framework
7{ 7{
8 public class AvatarPickerAvatar 8 public class AvatarPickerAvatar
9 { 9 {
10 public LLUUID AvatarID; 10 public LLUUID AvatarID;
11 public string firstName; 11 public string firstName;
12 public string lastName; 12 public string lastName;
13 } 13 }
14} 14}
diff --git a/OpenSim/Framework/Data.MapperFactory/DataMapperFactory.cs b/OpenSim/Framework/Data.MapperFactory/DataMapperFactory.cs
index 27f467f..37b933c 100644
--- a/OpenSim/Framework/Data.MapperFactory/DataMapperFactory.cs
+++ b/OpenSim/Framework/Data.MapperFactory/DataMapperFactory.cs
@@ -1,26 +1,26 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using OpenSim.Framework; 3using OpenSim.Framework;
4using OpenSim.Framework.Data; 4using OpenSim.Framework.Data;
5using OpenSim.Framework.Data.Base; 5using OpenSim.Framework.Data.Base;
6using OpenSim.Framework.Data.MySQLMapper; 6using OpenSim.Framework.Data.MySQLMapper;
7 7
8namespace OpenSim.Framework.Data.MapperFactory 8namespace OpenSim.Framework.Data.MapperFactory
9{ 9{
10 public class DataMapperFactory 10 public class DataMapperFactory
11 { 11 {
12 public enum MAPPER_TYPE { 12 public enum MAPPER_TYPE {
13 MYSQL, 13 MYSQL,
14 }; 14 };
15 15
16 static public BaseDatabaseConnector GetDataBaseMapper(MAPPER_TYPE type, string connectionString) 16 static public BaseDatabaseConnector GetDataBaseMapper(MAPPER_TYPE type, string connectionString)
17 { 17 {
18 switch (type) { 18 switch (type) {
19 case MAPPER_TYPE.MYSQL: 19 case MAPPER_TYPE.MYSQL:
20 return new MySQLDatabaseMapper(connectionString); 20 return new MySQLDatabaseMapper(connectionString);
21 default: 21 default:
22 return null; 22 return null;
23 } 23 }
24 } 24 }
25 } 25 }
26} 26}
diff --git a/OpenSim/Framework/Data/AssetDataBase.cs b/OpenSim/Framework/Data/AssetDataBase.cs
index 2162358..0f3044e 100644
--- a/OpenSim/Framework/Data/AssetDataBase.cs
+++ b/OpenSim/Framework/Data/AssetDataBase.cs
@@ -1,20 +1,20 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using libsecondlife; 4using libsecondlife;
5 5
6namespace OpenSim.Framework.Data 6namespace OpenSim.Framework.Data
7{ 7{
8 public abstract class AssetDataBase : IAssetProvider 8 public abstract class AssetDataBase : IAssetProvider
9 { 9 {
10 public abstract AssetBase FetchAsset(LLUUID uuid); 10 public abstract AssetBase FetchAsset(LLUUID uuid);
11 public abstract void CreateAsset(AssetBase asset); 11 public abstract void CreateAsset(AssetBase asset);
12 public abstract void UpdateAsset(AssetBase asset); 12 public abstract void UpdateAsset(AssetBase asset);
13 public abstract bool ExistsAsset(LLUUID uuid); 13 public abstract bool ExistsAsset(LLUUID uuid);
14 public abstract void CommitAssets(); 14 public abstract void CommitAssets();
15 15
16 public abstract string Version { get; } 16 public abstract string Version { get; }
17 public abstract string Name { get; } 17 public abstract string Name { get; }
18 public abstract void Initialise(); 18 public abstract void Initialise();
19 } 19 }
20} 20}
diff --git a/OpenSim/Framework/Data/DataStoreBase.cs b/OpenSim/Framework/Data/DataStoreBase.cs
index 671d0f0..92604f2 100644
--- a/OpenSim/Framework/Data/DataStoreBase.cs
+++ b/OpenSim/Framework/Data/DataStoreBase.cs
@@ -1,10 +1,10 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4 4
5namespace OpenSim.Framework.Data 5namespace OpenSim.Framework.Data
6{ 6{
7 public abstract class DataStoreBase 7 public abstract class DataStoreBase
8 { 8 {
9 } 9 }
10} 10}
diff --git a/OpenSim/Framework/Data/GridDataBase.cs b/OpenSim/Framework/Data/GridDataBase.cs
index 32a729a..9d6e832 100644
--- a/OpenSim/Framework/Data/GridDataBase.cs
+++ b/OpenSim/Framework/Data/GridDataBase.cs
@@ -1,22 +1,22 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using libsecondlife; 4using libsecondlife;
5 5
6namespace OpenSim.Framework.Data 6namespace OpenSim.Framework.Data
7{ 7{
8 public abstract class GridDataBase : IGridData 8 public abstract class GridDataBase : IGridData
9 { 9 {
10 public abstract RegionProfileData GetProfileByHandle(ulong regionHandle); 10 public abstract RegionProfileData GetProfileByHandle(ulong regionHandle);
11 public abstract RegionProfileData GetProfileByLLUUID(LLUUID UUID); 11 public abstract RegionProfileData GetProfileByLLUUID(LLUUID UUID);
12 public abstract RegionProfileData GetProfileByString(string regionName); 12 public abstract RegionProfileData GetProfileByString(string regionName);
13 public abstract RegionProfileData[] GetProfilesInRange(uint Xmin, uint Ymin, uint Xmax, uint Ymax); 13 public abstract RegionProfileData[] GetProfilesInRange(uint Xmin, uint Ymin, uint Xmax, uint Ymax);
14 public abstract bool AuthenticateSim(LLUUID UUID, ulong regionHandle, string simrecvkey); 14 public abstract bool AuthenticateSim(LLUUID UUID, ulong regionHandle, string simrecvkey);
15 public abstract void Initialise(); 15 public abstract void Initialise();
16 public abstract void Close(); 16 public abstract void Close();
17 public abstract string getName(); 17 public abstract string getName();
18 public abstract string getVersion(); 18 public abstract string getVersion();
19 public abstract DataResponse AddProfile(RegionProfileData profile); 19 public abstract DataResponse AddProfile(RegionProfileData profile);
20 public abstract ReservationData GetReservationAtPoint(uint x, uint y); 20 public abstract ReservationData GetReservationAtPoint(uint x, uint y);
21 } 21 }
22} 22}
diff --git a/OpenSim/Framework/Data/InventoryDataBase.cs b/OpenSim/Framework/Data/InventoryDataBase.cs
index d88acff..afddbf1 100644
--- a/OpenSim/Framework/Data/InventoryDataBase.cs
+++ b/OpenSim/Framework/Data/InventoryDataBase.cs
@@ -1,10 +1,10 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4 4
5namespace OpenSim.Framework.Data 5namespace OpenSim.Framework.Data
6{ 6{
7 public abstract class InventoryDataBase 7 public abstract class InventoryDataBase
8 { 8 {
9 } 9 }
10} 10}
diff --git a/OpenSim/Framework/Data/UserDataBase.cs b/OpenSim/Framework/Data/UserDataBase.cs
index 7a74693..5e0be45 100644
--- a/OpenSim/Framework/Data/UserDataBase.cs
+++ b/OpenSim/Framework/Data/UserDataBase.cs
@@ -1,29 +1,29 @@
1using System.Collections.Generic; 1using System.Collections.Generic;
2using libsecondlife; 2using libsecondlife;
3 3
4namespace OpenSim.Framework.Data 4namespace OpenSim.Framework.Data
5{ 5{
6 public abstract class UserDataBase : IUserData 6 public abstract class UserDataBase : IUserData
7 { 7 {
8 public abstract UserProfileData GetUserByUUID(LLUUID user); 8 public abstract UserProfileData GetUserByUUID(LLUUID user);
9 public abstract UserProfileData GetUserByName(string fname, string lname); 9 public abstract UserProfileData GetUserByName(string fname, string lname);
10 public abstract UserAgentData GetAgentByUUID(LLUUID user); 10 public abstract UserAgentData GetAgentByUUID(LLUUID user);
11 public abstract UserAgentData GetAgentByName(string name); 11 public abstract UserAgentData GetAgentByName(string name);
12 public abstract UserAgentData GetAgentByName(string fname, string lname); 12 public abstract UserAgentData GetAgentByName(string fname, string lname);
13 public abstract void StoreWebLoginKey(LLUUID agentID, LLUUID webLoginKey); 13 public abstract void StoreWebLoginKey(LLUUID agentID, LLUUID webLoginKey);
14 public abstract void AddNewUserProfile(UserProfileData user); 14 public abstract void AddNewUserProfile(UserProfileData user);
15 public abstract bool UpdateUserProfile(UserProfileData user); 15 public abstract bool UpdateUserProfile(UserProfileData user);
16 public abstract void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid); 16 public abstract void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid);
17 public abstract void AddNewUserAgent(UserAgentData agent); 17 public abstract void AddNewUserAgent(UserAgentData agent);
18 public abstract void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms); 18 public abstract void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms);
19 public abstract void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend); 19 public abstract void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend);
20 public abstract void UpdateUserFriendPerms(LLUUID friendlistowner, LLUUID friend, uint perms); 20 public abstract void UpdateUserFriendPerms(LLUUID friendlistowner, LLUUID friend, uint perms);
21 public abstract List<FriendListItem> GetUserFriendList(LLUUID friendlistowner); 21 public abstract List<FriendListItem> GetUserFriendList(LLUUID friendlistowner);
22 public abstract bool MoneyTransferRequest(LLUUID from, LLUUID to, uint amount); 22 public abstract bool MoneyTransferRequest(LLUUID from, LLUUID to, uint amount);
23 public abstract bool InventoryTransferRequest(LLUUID from, LLUUID to, LLUUID inventory); 23 public abstract bool InventoryTransferRequest(LLUUID from, LLUUID to, LLUUID inventory);
24 public abstract string GetVersion(); 24 public abstract string GetVersion();
25 public abstract string getName(); 25 public abstract string getName();
26 public abstract void Initialise(); 26 public abstract void Initialise();
27 public abstract List<OpenSim.Framework.AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query); 27 public abstract List<OpenSim.Framework.AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query);
28 } 28 }
29} 29}