diff options
| author | Don Kjer <don@lindenlab.com> | 2007-10-11 00:28:42 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-10-11 00:28:42 +0000 |
| commit | 1b550aaec246063090fe7143145d69eebfbd4680 (patch) | |
| tree | 66b1d7c9f424e0183c5488037fcdae3a37916955 /indra/newview/llpreviewgesture.cpp | |
| parent | 5ec8bbbe2244ea70d8aa74b5c572351632699425 (diff) | |
EFFECTIVE MERGE: svn merge -r 69928:70806 svn+ssh://svn/svn/linden/branches/maintenance-1 && svn merge -r 70948:70949 svn+ssh://svn/svn/linden/branches/maintenance-1-qa into release
ACTUAL MERGE: svn merge -r 71430:71431 svn+ssh://svn/svn/linden/qa/maintenance-1-merge-71429 into release
Diffstat (limited to 'indra/newview/llpreviewgesture.cpp')
| -rw-r--r-- | indra/newview/llpreviewgesture.cpp | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/indra/newview/llpreviewgesture.cpp b/indra/newview/llpreviewgesture.cpp index a9205998e6..720963cb0f 100644 --- a/indra/newview/llpreviewgesture.cpp +++ b/indra/newview/llpreviewgesture.cpp @@ -151,6 +151,13 @@ LLPreviewGesture* LLPreviewGesture::show(const std::string& title, const LLUUID& hostp->addFloater(self, TRUE); } + // Start speculative download of sounds and animations + LLUUID animation_folder_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_ANIMATION); + gInventory.startBackgroundFetch(animation_folder_id); + + LLUUID sound_folder_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_SOUND); + gInventory.startBackgroundFetch(sound_folder_id); + // this will call refresh when we have everything. LLViewerInventoryItem* item = (LLViewerInventoryItem*)self->getItem(); if(item && !item->isComplete()) @@ -577,8 +584,10 @@ void LLPreviewGesture::addAnimations() LLComboBox* combo = mAnimationCombo; combo->removeall(); + + LLString none_text = childGetText("none_text"); - combo->add("-- None --", LLUUID::null); + combo->add(none_text, LLUUID::null); // Add all the default (legacy) animations S32 i; @@ -628,6 +637,13 @@ void LLPreviewGesture::addAnimations() void LLPreviewGesture::addSounds() { + LLComboBox* combo = mSoundCombo; + combo->removeall(); + + LLString none_text = childGetText("none_text"); + + combo->add(none_text, LLUUID::null); + // Get all inventory items that are sounds LLViewerInventoryCategory::cat_array_t cats; LLViewerInventoryItem::item_array_t items; @@ -655,8 +671,6 @@ void LLPreviewGesture::addSounds() std::sort(sounds.begin(), sounds.end(), SortItemPtrsByName()); // And load up the combobox - LLComboBox* combo = mSoundCombo; - combo->removeall(); std::vector<LLInventoryItem*>::iterator it; for (it = sounds.begin(); it != sounds.end(); ++it) { |