diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-23 13:03:20 +0200 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-23 13:03:20 +0200 |
| commit | 3f43e07b33942c54bf81aac1d466c3eb771b8a8d (patch) | |
| tree | e433304bb14d8f680ed01c9122c950882e5c7311 | |
| parent | 3defdaa0071418ce15c0d33a3b25f8338763ccf1 (diff) | |
| parent | 1412e4f6671fed1641a0fa4372971aea9ab0bd2f (diff) | |
merge
--HG--
branch : product-engine
| -rw-r--r-- | indra/llui/llflatlistview.h | 2 | ||||
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 13 |
2 files changed, 15 insertions, 0 deletions
diff --git a/indra/llui/llflatlistview.h b/indra/llui/llflatlistview.h index 26e84a6fe1..a488b00854 100644 --- a/indra/llui/llflatlistview.h +++ b/indra/llui/llflatlistview.h @@ -124,6 +124,8 @@ public: /** Returns full rect of child panel */ const LLRect& getItemsRect() const; + LLRect getRequiredRect() { return getItemsRect(); } + /** Returns distance between items */ const S32 getItemsPad() { return mItemPad; } diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 6a31bbfa1e..519f58ca95 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -906,7 +906,20 @@ void open_inventory_offer(const std::vector<LLUUID>& items, const std::string& f LLFloaterReg::showInstance("preview_texture", LLSD(item_id), take_focus); break; } + case LLAssetType::AT_ANIMATION: + LLFloaterReg::showInstance("preview_anim", LLSD(item_id), take_focus); + break; + case LLAssetType::AT_GESTURE: + LLFloaterReg::showInstance("preview_gesture", LLSD(item_id), take_focus); + break; + case LLAssetType::AT_SCRIPT: + LLFloaterReg::showInstance("preview_script", LLSD(item_id), take_focus); + break; + case LLAssetType::AT_SOUND: + LLFloaterReg::showInstance("preview_sound", LLSD(item_id), take_focus); + break; default: + LLFloaterReg::showInstance("properties", LLSD(item_id), take_focus); break; } } |