diff options
author | MW | 2007-12-02 14:56:23 +0000 |
---|---|---|
committer | MW | 2007-12-02 14:56:23 +0000 |
commit | cac98171e5143dbcd37acca00a9e4ed87ec4e477 (patch) | |
tree | 5df6b0bc82d928f318b5c988765b5fadf7b2998f /OpenSim/Framework | |
parent | Fixes a bug that my last commit introduced. (diff) | |
download | opensim-SC-cac98171e5143dbcd37acca00a9e4ed87ec4e477.zip opensim-SC-cac98171e5143dbcd37acca00a9e4ed87ec4e477.tar.gz opensim-SC-cac98171e5143dbcd37acca00a9e4ed87ec4e477.tar.bz2 opensim-SC-cac98171e5143dbcd37acca00a9e4ed87ec4e477.tar.xz |
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 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/AssetTransactions.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/CommunicationsManager.cs | 16 |
2 files changed, 7 insertions, 11 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs index acd57b6..f7e80c9 100644 --- a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs +++ b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs | |||
@@ -333,7 +333,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
333 | //really need to fix this call, if lbsa71 saw this he would die. | 333 | //really need to fix this call, if lbsa71 saw this he would die. |
334 | m_userTransactions.Manager.CommsManager.AssetCache.AddAsset(Asset); | 334 | m_userTransactions.Manager.CommsManager.AssetCache.AddAsset(Asset); |
335 | CachedUserInfo userInfo = | 335 | CachedUserInfo userInfo = |
336 | m_userTransactions.Manager.CommsManager.UserProfileCache.GetUserDetails(ourClient.AgentId); | 336 | m_userTransactions.Manager.CommsManager.UserProfileCacheService.GetUserDetails(ourClient.AgentId); |
337 | if (userInfo != null) | 337 | if (userInfo != null) |
338 | { | 338 | { |
339 | InventoryItemBase item = new InventoryItemBase(); | 339 | InventoryItemBase item = new InventoryItemBase(); |
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs index d4ddead..bfdd118 100644 --- a/OpenSim/Framework/Communications/CommunicationsManager.cs +++ b/OpenSim/Framework/Communications/CommunicationsManager.cs | |||
@@ -64,11 +64,11 @@ namespace OpenSim.Framework.Communications | |||
64 | get { return m_interRegion; } | 64 | get { return m_interRegion; } |
65 | } | 65 | } |
66 | 66 | ||
67 | protected UserProfileCacheService m_userProfileCache; | 67 | protected UserProfileCacheService m_userProfileCacheService; |
68 | 68 | ||
69 | public UserProfileCacheService UserProfileCache | 69 | public UserProfileCacheService UserProfileCacheService |
70 | { | 70 | { |
71 | get { return m_userProfileCache; } | 71 | get { return m_userProfileCacheService; } |
72 | } | 72 | } |
73 | 73 | ||
74 | protected AssetTransactionManager m_transactionsManager; | 74 | protected AssetTransactionManager m_transactionsManager; |
@@ -97,7 +97,7 @@ namespace OpenSim.Framework.Communications | |||
97 | { | 97 | { |
98 | m_networkServersInfo = serversInfo; | 98 | m_networkServersInfo = serversInfo; |
99 | m_assetCache = assetCache; | 99 | m_assetCache = assetCache; |
100 | m_userProfileCache = new UserProfileCacheService(this); | 100 | m_userProfileCacheService = new UserProfileCacheService(this); |
101 | m_transactionsManager = new AssetTransactionManager(this, dumpAssetsToFile); | 101 | m_transactionsManager = new AssetTransactionManager(this, dumpAssetsToFile); |
102 | } | 102 | } |
103 | 103 | ||
@@ -156,7 +156,7 @@ namespace OpenSim.Framework.Communications | |||
156 | 156 | ||
157 | public void HandleUUIDNameRequest(LLUUID uuid, IClientAPI remote_client) | 157 | public void HandleUUIDNameRequest(LLUUID uuid, IClientAPI remote_client) |
158 | { | 158 | { |
159 | if (uuid == m_userProfileCache.libraryRoot.agentID) | 159 | if (uuid == m_userProfileCacheService.libraryRoot.agentID) |
160 | { | 160 | { |
161 | remote_client.SendNameReply(uuid, "Mr", "OpenSim"); | 161 | remote_client.SendNameReply(uuid, "Mr", "OpenSim"); |
162 | } | 162 | } |
@@ -175,11 +175,7 @@ namespace OpenSim.Framework.Communications | |||
175 | } | 175 | } |
176 | public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(LLUUID queryID, string query) | 176 | public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(LLUUID queryID, string query) |
177 | { | 177 | { |
178 | 178 | List<AvatarPickerAvatar> pickerlist = m_userService.GenerateAgentPickerRequestResponse(queryID, query); | |
179 | |||
180 | List<AvatarPickerAvatar> pickerlist = m_userService.GenerateAgentPickerRequestResponse(queryID, query); | ||
181 | |||
182 | |||
183 | return pickerlist; | 179 | return pickerlist; |
184 | } | 180 | } |
185 | 181 | ||