diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-16 17:51:35 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-16 17:51:35 -0500 |
| commit | fb8ba15801f0620699fecdf2ed08668df0be7210 (patch) | |
| tree | 1deb6dba4108ca00fd470833b9b390ad786f0832 | |
| parent | d4899435a0832ce686648111819b7cab04d55ec7 (diff) | |
| parent | aa7e8e380b9c66e85c071d328eddb53133602fa2 (diff) | |
Automated merge with file:///Users/oz/Work/viewer-development
| -rw-r--r-- | doc/contributions.txt | 3 | ||||
| -rw-r--r-- | indra/newview/llsidepaneliteminfo.cpp | 9 | ||||
| -rw-r--r-- | indra/newview/llsidepaneliteminfo.h | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 23 |
4 files changed, 34 insertions, 2 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 67683204e2..780fa0e3c8 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -372,6 +372,7 @@ Khyota Wulluf VWR-9966 Kitty Barnett VWR-19699 + STORM-288 Kunnis Basiat VWR-82 VWR-102 @@ -774,10 +775,12 @@ WolfPup Lowenhar STORM-143 STORM-255 STORM-256 + STORM-288 STORM-535 STORM-544 STORM-654 STORM-674 + STORM-776 VWR-20741 VWR-20933 Zai Lynch diff --git a/indra/newview/llsidepaneliteminfo.cpp b/indra/newview/llsidepaneliteminfo.cpp index be797ea937..c8c6858b81 100644 --- a/indra/newview/llsidepaneliteminfo.cpp +++ b/indra/newview/llsidepaneliteminfo.cpp @@ -71,12 +71,12 @@ void LLItemPropertiesObserver::changed(U32 mask) const std::set<LLUUID>& mChangedItemIDs = gInventory.getChangedIDs(); std::set<LLUUID>::const_iterator it; - const LLUUID& object_id = mFloater->getObjectID(); + const LLUUID& item_id = mFloater->getItemID(); for (it = mChangedItemIDs.begin(); it != mChangedItemIDs.end(); it++) { // set dirty for 'item profile panel' only if changed item is the item for which 'item profile panel' is shown (STORM-288) - if (*it == object_id) + if (*it == item_id) { // if there's a change we're interested in. if((mask & (LLInventoryObserver::LABEL | LLInventoryObserver::INTERNAL | LLInventoryObserver::REMOVE)) != 0) @@ -196,6 +196,11 @@ const LLUUID& LLSidepanelItemInfo::getObjectID() const return mObjectID; } +const LLUUID& LLSidepanelItemInfo::getItemID() const +{ + return mItemID; +} + void LLSidepanelItemInfo::reset() { LLSidepanelInventorySubpanel::reset(); diff --git a/indra/newview/llsidepaneliteminfo.h b/indra/newview/llsidepaneliteminfo.h index 6416e2cfe4..25be145f64 100644 --- a/indra/newview/llsidepaneliteminfo.h +++ b/indra/newview/llsidepaneliteminfo.h @@ -55,6 +55,7 @@ public: void setEditMode(BOOL edit); const LLUUID& getObjectID() const; + const LLUUID& getItemID() const; protected: /*virtual*/ void refresh(); diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 907f68dc06..3b1ebc64ab 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -976,6 +976,29 @@ parameter="perm_prefs" /> </menu_item_call> </menu> + <menu_item_separator/> + <menu_item_call + enabled="false" + label="Undo" + name="Undo" + shortcut="control|Z"> + <on_click + function="Edit.Undo" + userdata="" /> + <on_enable + function="Edit.EnableUndo" /> + </menu_item_call> + <menu_item_call + enabled="false" + label="Redo" + name="Redo" + shortcut="control|Y"> + <on_click + function="Edit.Redo" + userdata="" /> + <on_enable + function="Edit.EnableRedo" /> + </menu_item_call> </menu> <menu create_jump_keys="true" |