diff options
author | Teravus Ovares | 2008-04-27 20:10:28 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-04-27 20:10:28 +0000 |
commit | 911e63765c7cea748b5ae2227f5c1d6ff131d329 (patch) | |
tree | f95eeffb4974a9b3f6ded4a46bdc240278a336b0 /OpenSim/Framework | |
parent | Minor svn, formatting cleanup. (diff) | |
download | opensim-SC-911e63765c7cea748b5ae2227f5c1d6ff131d329.zip opensim-SC-911e63765c7cea748b5ae2227f5c1d6ff131d329.tar.gz opensim-SC-911e63765c7cea748b5ae2227f5c1d6ff131d329.tar.bz2 opensim-SC-911e63765c7cea748b5ae2227f5c1d6ff131d329.tar.xz |
* Single Attachments now work from inventory. You can attach from inventory and detach from inventory.
* Detaching from right clicking in world, detaches to your inventory.
* If you go up to a prim and attach it from in world, it appears in your inventory.
* Attachment placement is saved when you detach them.
* Choosing wear remembers your last attachment point from inventory.
* Wrote a method to update an inventory item's asset and sends the updated inventory item to the Client
* Wrote a recursive method to find the folder of a known existing inventory item.
* Removed a block on physics object position on creation. This might crash a region or two, let us know via Mantis if your region crashes because of a physics out of bounds error.
* Drop doesn't work. The menu item doesn't even come up. Don't know why :P.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/CachedUserInfo.cs | 9 | ||||
-rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs index f1268d5..9749366 100644 --- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs +++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs | |||
@@ -272,8 +272,13 @@ namespace OpenSim.Framework.Communications.Cache | |||
272 | { | 272 | { |
273 | if (!RootFolder.Items.ContainsKey(itemInfo.ID)) | 273 | if (!RootFolder.Items.ContainsKey(itemInfo.ID)) |
274 | { | 274 | { |
275 | |||
275 | RootFolder.Items.Add(itemInfo.ID, itemInfo); | 276 | RootFolder.Items.Add(itemInfo.ID, itemInfo); |
276 | } | 277 | } |
278 | else | ||
279 | { | ||
280 | RootFolder.Items[itemInfo.ID] = itemInfo; | ||
281 | } | ||
277 | } | 282 | } |
278 | } | 283 | } |
279 | else | 284 | else |
@@ -287,6 +292,10 @@ namespace OpenSim.Framework.Communications.Cache | |||
287 | { | 292 | { |
288 | folder.Items.Add(itemInfo.ID, itemInfo); | 293 | folder.Items.Add(itemInfo.ID, itemInfo); |
289 | } | 294 | } |
295 | else | ||
296 | { | ||
297 | folder.Items[itemInfo.ID] = itemInfo; | ||
298 | } | ||
290 | } | 299 | } |
291 | } | 300 | } |
292 | } | 301 | } |
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 174d20a..fb32397 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -455,6 +455,7 @@ namespace OpenSim.Framework | |||
455 | event SetAppearance OnSetAppearance; | 455 | event SetAppearance OnSetAppearance; |
456 | event AvatarNowWearing OnAvatarNowWearing; | 456 | event AvatarNowWearing OnAvatarNowWearing; |
457 | event RezSingleAttachmentFromInv OnRezSingleAttachmentFromInv; | 457 | event RezSingleAttachmentFromInv OnRezSingleAttachmentFromInv; |
458 | event UUIDNameRequest OnDetachAttachmentIntoInv; | ||
458 | event ObjectAttach OnObjectAttach; | 459 | event ObjectAttach OnObjectAttach; |
459 | event ObjectDeselect OnObjectDetach; | 460 | event ObjectDeselect OnObjectDetach; |
460 | event StartAnim OnStartAnim; | 461 | event StartAnim OnStartAnim; |