diff options
author | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
commit | 7d89e122930be39e84a6d174548fa2d12ac0484a (patch) | |
tree | e5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Framework/IUserData.cs | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz |
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle.
* This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big!
* Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to 'OpenSim/Framework/IUserData.cs')
-rw-r--r-- | OpenSim/Framework/IUserData.cs | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/OpenSim/Framework/IUserData.cs b/OpenSim/Framework/IUserData.cs index ffde002..4089253 100644 --- a/OpenSim/Framework/IUserData.cs +++ b/OpenSim/Framework/IUserData.cs | |||
@@ -26,7 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using libsecondlife; | 29 | using OpenMetaverse; |
30 | 30 | ||
31 | namespace OpenSim.Framework | 31 | namespace OpenSim.Framework |
32 | { | 32 | { |
@@ -40,7 +40,7 @@ namespace OpenSim.Framework | |||
40 | /// </summary> | 40 | /// </summary> |
41 | /// <param name="user">The user's UUID</param> | 41 | /// <param name="user">The user's UUID</param> |
42 | /// <returns>The user data profile. Returns null if no user is found</returns> | 42 | /// <returns>The user data profile. Returns null if no user is found</returns> |
43 | UserProfileData GetUserByUUID(LLUUID user); | 43 | UserProfileData GetUserByUUID(UUID user); |
44 | 44 | ||
45 | /// <summary> | 45 | /// <summary> |
46 | /// Returns a users profile by searching their username parts | 46 | /// Returns a users profile by searching their username parts |
@@ -56,14 +56,14 @@ namespace OpenSim.Framework | |||
56 | /// <param name="queryID">ID associated with the user's query. This must match what the client sent</param> | 56 | /// <param name="queryID">ID associated with the user's query. This must match what the client sent</param> |
57 | /// <param name="query">The filtered contents of the search box when the user hit search.</param> | 57 | /// <param name="query">The filtered contents of the search box when the user hit search.</param> |
58 | /// <returns>The user data profile</returns> | 58 | /// <returns>The user data profile</returns> |
59 | List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query); | 59 | List<AvatarPickerAvatar> GeneratePickerResults(UUID queryID, string query); |
60 | 60 | ||
61 | /// <summary> | 61 | /// <summary> |
62 | /// Returns the current agent for a user searching by it's UUID | 62 | /// Returns the current agent for a user searching by it's UUID |
63 | /// </summary> | 63 | /// </summary> |
64 | /// <param name="user">The users UUID</param> | 64 | /// <param name="user">The users UUID</param> |
65 | /// <returns>The current agent session</returns> | 65 | /// <returns>The current agent session</returns> |
66 | UserAgentData GetAgentByUUID(LLUUID user); | 66 | UserAgentData GetAgentByUUID(UUID user); |
67 | 67 | ||
68 | /// <summary> | 68 | /// <summary> |
69 | /// Returns the current session agent for a user searching by username | 69 | /// Returns the current session agent for a user searching by username |
@@ -84,7 +84,7 @@ namespace OpenSim.Framework | |||
84 | /// Stores new web-login key for user during web page login | 84 | /// Stores new web-login key for user during web page login |
85 | /// </summary> | 85 | /// </summary> |
86 | /// <param name="webLoginKey"></param> | 86 | /// <param name="webLoginKey"></param> |
87 | void StoreWebLoginKey(LLUUID agentID, LLUUID webLoginKey); | 87 | void StoreWebLoginKey(UUID agentID, UUID webLoginKey); |
88 | 88 | ||
89 | /// <summary> | 89 | /// <summary> |
90 | /// Adds a new User profile to the database | 90 | /// Adds a new User profile to the database |
@@ -99,7 +99,7 @@ namespace OpenSim.Framework | |||
99 | bool UpdateUserProfile(UserProfileData user); | 99 | bool UpdateUserProfile(UserProfileData user); |
100 | 100 | ||
101 | 101 | ||
102 | void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid, ulong regionhandle); | 102 | void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle); |
103 | /// <summary> | 103 | /// <summary> |
104 | /// Adds a new agent to the database | 104 | /// Adds a new agent to the database |
105 | /// </summary> | 105 | /// </summary> |
@@ -112,14 +112,14 @@ namespace OpenSim.Framework | |||
112 | /// <param name="friendlistowner">The agent that who's friends list is being added to</param> | 112 | /// <param name="friendlistowner">The agent that who's friends list is being added to</param> |
113 | /// <param name="friend">The agent that being added to the friends list of the friends list owner</param> | 113 | /// <param name="friend">The agent that being added to the friends list of the friends list owner</param> |
114 | /// <param name="perms">A uint bit vector for set perms that the friend being added has; 0 = none, 1=This friend can see when they sign on, 2 = map, 4 edit objects </param> | 114 | /// <param name="perms">A uint bit vector for set perms that the friend being added has; 0 = none, 1=This friend can see when they sign on, 2 = map, 4 edit objects </param> |
115 | void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms); | 115 | void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms); |
116 | 116 | ||
117 | /// <summary> | 117 | /// <summary> |
118 | /// Delete friend on friendlistowner's friendlist. | 118 | /// Delete friend on friendlistowner's friendlist. |
119 | /// </summary> | 119 | /// </summary> |
120 | /// <param name="friendlistowner">The agent that who's friends list is being updated</param> | 120 | /// <param name="friendlistowner">The agent that who's friends list is being updated</param> |
121 | /// <param name="friend">The Ex-friend agent</param> | 121 | /// <param name="friend">The Ex-friend agent</param> |
122 | void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend); | 122 | void RemoveUserFriend(UUID friendlistowner, UUID friend); |
123 | 123 | ||
124 | /// <summary> | 124 | /// <summary> |
125 | /// Update permissions for friend on friendlistowner's friendlist. | 125 | /// Update permissions for friend on friendlistowner's friendlist. |
@@ -127,13 +127,13 @@ namespace OpenSim.Framework | |||
127 | /// <param name="friendlistowner">The agent that who's friends list is being updated</param> | 127 | /// <param name="friendlistowner">The agent that who's friends list is being updated</param> |
128 | /// <param name="friend">The agent that is getting or loosing permissions</param> | 128 | /// <param name="friend">The agent that is getting or loosing permissions</param> |
129 | /// <param name="perms">A uint bit vector for set perms that the friend being added has; 0 = none, 1=This friend can see when they sign on, 2 = map, 4 edit objects </param> | 129 | /// <param name="perms">A uint bit vector for set perms that the friend being added has; 0 = none, 1=This friend can see when they sign on, 2 = map, 4 edit objects </param> |
130 | void UpdateUserFriendPerms(LLUUID friendlistowner, LLUUID friend, uint perms); | 130 | void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms); |
131 | 131 | ||
132 | /// <summary> | 132 | /// <summary> |
133 | /// Returns a list of FriendsListItems that describe the friends and permissions in the friend relationship for LLUUID friendslistowner | 133 | /// Returns a list of FriendsListItems that describe the friends and permissions in the friend relationship for UUID friendslistowner |
134 | /// </summary> | 134 | /// </summary> |
135 | /// <param name="friendlistowner">The agent that we're retreiving the friends Data.</param> | 135 | /// <param name="friendlistowner">The agent that we're retreiving the friends Data.</param> |
136 | List<FriendListItem> GetUserFriendList(LLUUID friendlistowner); | 136 | List<FriendListItem> GetUserFriendList(UUID friendlistowner); |
137 | 137 | ||
138 | /// <summary> | 138 | /// <summary> |
139 | /// Attempts to move currency units between accounts (NOT RELIABLE / TRUSTWORTHY. DONT TRY RUN YOUR OWN CURRENCY EXCHANGE WITH REAL VALUES) | 139 | /// Attempts to move currency units between accounts (NOT RELIABLE / TRUSTWORTHY. DONT TRY RUN YOUR OWN CURRENCY EXCHANGE WITH REAL VALUES) |
@@ -142,7 +142,7 @@ namespace OpenSim.Framework | |||
142 | /// <param name="to">The account to transfer to</param> | 142 | /// <param name="to">The account to transfer to</param> |
143 | /// <param name="amount">The amount to transfer</param> | 143 | /// <param name="amount">The amount to transfer</param> |
144 | /// <returns>Successful?</returns> | 144 | /// <returns>Successful?</returns> |
145 | bool MoneyTransferRequest(LLUUID from, LLUUID to, uint amount); | 145 | bool MoneyTransferRequest(UUID from, UUID to, uint amount); |
146 | 146 | ||
147 | /// <summary> | 147 | /// <summary> |
148 | /// Attempts to move inventory between accounts, if inventory is copyable it will be copied into the target account. | 148 | /// Attempts to move inventory between accounts, if inventory is copyable it will be copied into the target account. |
@@ -151,7 +151,7 @@ namespace OpenSim.Framework | |||
151 | /// <param name="to">User to transfer to</param> | 151 | /// <param name="to">User to transfer to</param> |
152 | /// <param name="inventory">Specified inventory item</param> | 152 | /// <param name="inventory">Specified inventory item</param> |
153 | /// <returns>Successful?</returns> | 153 | /// <returns>Successful?</returns> |
154 | bool InventoryTransferRequest(LLUUID from, LLUUID to, LLUUID inventory); | 154 | bool InventoryTransferRequest(UUID from, UUID to, UUID inventory); |
155 | 155 | ||
156 | /// <summary> | 156 | /// <summary> |
157 | /// Initialises the plugin (artificial constructor) | 157 | /// Initialises the plugin (artificial constructor) |
@@ -161,11 +161,11 @@ namespace OpenSim.Framework | |||
161 | /// <summary> | 161 | /// <summary> |
162 | /// Gets the user appearance | 162 | /// Gets the user appearance |
163 | /// </summer> | 163 | /// </summer> |
164 | AvatarAppearance GetUserAppearance(LLUUID user); | 164 | AvatarAppearance GetUserAppearance(UUID user); |
165 | 165 | ||
166 | void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance); | 166 | void UpdateUserAppearance(UUID user, AvatarAppearance appearance); |
167 | 167 | ||
168 | void ResetAttachments(LLUUID userID); | 168 | void ResetAttachments(UUID userID); |
169 | } | 169 | } |
170 | 170 | ||
171 | public class UserDataInitialiser : PluginInitialiserBase | 171 | public class UserDataInitialiser : PluginInitialiserBase |