diff options
Very partial Avatar Appearance (ie, clothes/body parts) "storage". In standalone mode it will mean that when you log off and log back on ,as long as the region server hasn't been restarted , your avatar will start with wearing the clothes that it wore on log off. In grid mode its even more limited in that wearing/removing clothes/body parts are only stored in the region server instance you are one. so if you are in a different region to your login region (which are on different region server instances), and then change clothes, those changes won't be remembered. So as said, its very limited but is a small step towards having proper appearance persist.
Just need to store this data out to a database.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index 759d070..6370bcb 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |||
@@ -53,7 +53,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
53 | 53 | ||
54 | public void AddInventoryItem(IClientAPI remoteClient, InventoryItemBase item) | 54 | public void AddInventoryItem(IClientAPI remoteClient, InventoryItemBase item) |
55 | { | 55 | { |
56 | CachedUserInfo userInfo = CommsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId); | 56 | CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId); |
57 | if (userInfo != null) | 57 | if (userInfo != null) |
58 | { | 58 | { |
59 | userInfo.AddItem(remoteClient.AgentId, item); | 59 | userInfo.AddItem(remoteClient.AgentId, item); |
@@ -75,7 +75,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
75 | 75 | ||
76 | public LLUUID CapsUpdateInventoryItemAsset(IClientAPI remoteClient, LLUUID itemID, byte[] data) | 76 | public LLUUID CapsUpdateInventoryItemAsset(IClientAPI remoteClient, LLUUID itemID, byte[] data) |
77 | { | 77 | { |
78 | CachedUserInfo userInfo = CommsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId); | 78 | CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId); |
79 | if (userInfo != null) | 79 | if (userInfo != null) |
80 | { | 80 | { |
81 | if (userInfo.RootFolder != null) | 81 | if (userInfo.RootFolder != null) |
@@ -109,7 +109,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
109 | public void UDPUpdateInventoryItemAsset(IClientAPI remoteClient, LLUUID transactionID, LLUUID assetID, | 109 | public void UDPUpdateInventoryItemAsset(IClientAPI remoteClient, LLUUID transactionID, LLUUID assetID, |
110 | LLUUID itemID) | 110 | LLUUID itemID) |
111 | { | 111 | { |
112 | CachedUserInfo userInfo = CommsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId); | 112 | CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId); |
113 | if (userInfo != null) | 113 | if (userInfo != null) |
114 | { | 114 | { |
115 | if (userInfo.RootFolder != null) | 115 | if (userInfo.RootFolder != null) |
@@ -157,10 +157,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
157 | 157 | ||
158 | public void CopyInventoryItem(IClientAPI remoteClient, uint callbackID, LLUUID oldAgentID, LLUUID oldItemID, LLUUID newFolderID, string newName) | 158 | public void CopyInventoryItem(IClientAPI remoteClient, uint callbackID, LLUUID oldAgentID, LLUUID oldItemID, LLUUID newFolderID, string newName) |
159 | { | 159 | { |
160 | InventoryItemBase item = CommsManager.UserProfileCache.libraryRoot.HasItem(oldItemID); | 160 | InventoryItemBase item = CommsManager.UserProfileCacheService.libraryRoot.HasItem(oldItemID); |
161 | if (item == null) | 161 | if (item == null) |
162 | { | 162 | { |
163 | CachedUserInfo userInfo = CommsManager.UserProfileCache.GetUserDetails(oldAgentID); | 163 | CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(oldAgentID); |
164 | if (userInfo == null) | 164 | if (userInfo == null) |
165 | { | 165 | { |
166 | MainLog.Instance.Warn("INVENTORY", "Failed to find user " + oldAgentID.ToString()); | 166 | MainLog.Instance.Warn("INVENTORY", "Failed to find user " + oldAgentID.ToString()); |
@@ -212,7 +212,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
212 | private void CreateNewInventoryItem(IClientAPI remoteClient, LLUUID folderID, uint callbackID, | 212 | private void CreateNewInventoryItem(IClientAPI remoteClient, LLUUID folderID, uint callbackID, |
213 | AssetBase asset, uint nextOwnerMask) | 213 | AssetBase asset, uint nextOwnerMask) |
214 | { | 214 | { |
215 | CachedUserInfo userInfo = CommsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId); | 215 | CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId); |
216 | if (userInfo != null) | 216 | if (userInfo != null) |
217 | { | 217 | { |
218 | InventoryItemBase item = new InventoryItemBase(); | 218 | InventoryItemBase item = new InventoryItemBase(); |
@@ -252,7 +252,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
252 | { | 252 | { |
253 | if (transActionID == LLUUID.Zero) | 253 | if (transActionID == LLUUID.Zero) |
254 | { | 254 | { |
255 | CachedUserInfo userInfo = CommsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId); | 255 | CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId); |
256 | if (userInfo != null) | 256 | if (userInfo != null) |
257 | { | 257 | { |
258 | AssetBase asset = CreateAsset(name, description, invType, assetType, null); | 258 | AssetBase asset = CreateAsset(name, description, invType, assetType, null); |
@@ -320,7 +320,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
320 | 320 | ||
321 | public void RezScript(IClientAPI remoteClient, LLUUID itemID, uint localID) | 321 | public void RezScript(IClientAPI remoteClient, LLUUID itemID, uint localID) |
322 | { | 322 | { |
323 | CachedUserInfo userInfo = CommsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId); | 323 | CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId); |
324 | LLUUID copyID = LLUUID.Random(); | 324 | LLUUID copyID = LLUUID.Random(); |
325 | if (userInfo != null) | 325 | if (userInfo != null) |
326 | { | 326 | { |
@@ -398,7 +398,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
398 | if (PermissionsMngr.CanDeRezObject(remoteClient.AgentId, ((SceneObjectGroup) selectedEnt).UUID)) | 398 | if (PermissionsMngr.CanDeRezObject(remoteClient.AgentId, ((SceneObjectGroup) selectedEnt).UUID)) |
399 | { | 399 | { |
400 | string sceneObjectXml = ((SceneObjectGroup) selectedEnt).ToXmlString(); | 400 | string sceneObjectXml = ((SceneObjectGroup) selectedEnt).ToXmlString(); |
401 | CachedUserInfo userInfo = CommsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId); | 401 | CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId); |
402 | if (userInfo != null) | 402 | if (userInfo != null) |
403 | { | 403 | { |
404 | AssetBase asset = CreateAsset( | 404 | AssetBase asset = CreateAsset( |
@@ -454,7 +454,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
454 | 454 | ||
455 | public virtual void RezObject(IClientAPI remoteClient, LLUUID itemID, LLVector3 pos) | 455 | public virtual void RezObject(IClientAPI remoteClient, LLUUID itemID, LLVector3 pos) |
456 | { | 456 | { |
457 | CachedUserInfo userInfo = CommsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId); | 457 | CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId); |
458 | if (userInfo != null) | 458 | if (userInfo != null) |
459 | { | 459 | { |
460 | if (userInfo.RootFolder != null) | 460 | if (userInfo.RootFolder != null) |