diff options
Can now turn on/off server side permission checking (on prim editing etc) from the opensim.ini file. Just add a line to the Startup section like : serverside_object_permissions = true
Changes /editing that are made to clothing/ body parts in your inventory should now be saved between logins/ restarts.
Diffstat (limited to 'OpenSim/Framework/Communications/Cache/AssetTransactions.cs')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/AssetTransactions.cs | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs index addd20a..4cde5f6 100644 --- a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs +++ b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs | |||
@@ -103,6 +103,15 @@ namespace OpenSim.Framework.Communications.Caches | |||
103 | } | 103 | } |
104 | } | 104 | } |
105 | 105 | ||
106 | public AssetBase GetTransactionAsset(LLUUID transactionID) | ||
107 | { | ||
108 | if (this.XferUploaders.ContainsKey(transactionID)) | ||
109 | { | ||
110 | return XferUploaders[transactionID].GetAssetData(); | ||
111 | } | ||
112 | return null; | ||
113 | } | ||
114 | |||
106 | // Nested Types | 115 | // Nested Types |
107 | public class AssetCapsUploader | 116 | public class AssetCapsUploader |
108 | { | 117 | { |
@@ -298,6 +307,7 @@ namespace OpenSim.Framework.Communications.Caches | |||
298 | 307 | ||
299 | private void DoCreateItem() | 308 | private void DoCreateItem() |
300 | { | 309 | { |
310 | //really need to fix this call, if lbsa71 saw this he would die. | ||
301 | this.m_userTransactions.Manager.CommsManager.AssetCache.AddAsset(this.Asset); | 311 | this.m_userTransactions.Manager.CommsManager.AssetCache.AddAsset(this.Asset); |
302 | CachedUserInfo userInfo = m_userTransactions.Manager.CommsManager.UserProfiles.GetUserDetails(ourClient.AgentId); | 312 | CachedUserInfo userInfo = m_userTransactions.Manager.CommsManager.UserProfiles.GetUserDetails(ourClient.AgentId); |
303 | if (userInfo != null) | 313 | if (userInfo != null) |
@@ -324,6 +334,15 @@ namespace OpenSim.Framework.Communications.Caches | |||
324 | { | 334 | { |
325 | 335 | ||
326 | } | 336 | } |
337 | |||
338 | public AssetBase GetAssetData() | ||
339 | { | ||
340 | if (m_finished) | ||
341 | { | ||
342 | return this.Asset; | ||
343 | } | ||
344 | return null; | ||
345 | } | ||
327 | } | 346 | } |
328 | 347 | ||
329 | public class NoteCardCapsUpdate | 348 | public class NoteCardCapsUpdate |