diff options
| author | Richard Nelson <richard@lindenlab.com> | 2007-02-17 03:02:16 +0000 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2007-02-17 03:02:16 +0000 |
| commit | 73bc0fb42b5bcd80030d9f30d5cb57ec2397ba08 (patch) | |
| tree | e7c0b2e22d4719123fd688e49a16b76a084c3f77 /indra/newview/llpreview.cpp | |
| parent | 12ac04231b8d358e70c830f7958f7efbc0f7c0d1 (diff) | |
merge -r 56779:58057 /branches/selection_management
Diffstat (limited to 'indra/newview/llpreview.cpp')
| -rw-r--r-- | indra/newview/llpreview.cpp | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/indra/newview/llpreview.cpp b/indra/newview/llpreview.cpp index a2cb01310f..7241b939ad 100644 --- a/indra/newview/llpreview.cpp +++ b/indra/newview/llpreview.cpp @@ -33,6 +33,7 @@ // Globals and statics LLPreview::preview_multimap_t LLPreview::sPreviewsBySource; LLPreview::preview_map_t LLPreview::sInstances; +std::map<LLUUID, LLViewHandle> LLMultiPreview::sAutoOpenPreviewHandles; // Functions LLPreview::LLPreview(const std::string& name) : @@ -200,11 +201,11 @@ void LLPreview::onCommit() { gSelectMgr->deselectAll(); gSelectMgr->addAsIndividual( obj, SELECT_ALL_TES, FALSE ); - gSelectMgr->setObjectDescription( childGetText("desc") ); + gSelectMgr->selectionSetObjectDescription( childGetText("desc") ); if( has_sale_info ) { - gSelectMgr->setObjectSaleInfo( sale_info ); + gSelectMgr->selectionSetObjectSaleInfo( sale_info ); } gSelectMgr->deselectAll(); @@ -492,3 +493,23 @@ void LLMultiPreview::tabOpen(LLFloater* opened_floater, bool from_click) opened_preview->loadAsset(); } } + +//static +LLMultiPreview* LLMultiPreview::getAutoOpenInstance(const LLUUID& id) +{ + handle_map_t::iterator found_it = sAutoOpenPreviewHandles.find(id); + if (found_it != sAutoOpenPreviewHandles.end()) + { + return (LLMultiPreview*)gFloaterView->getFloaterByHandle(found_it->second); + } + return NULL; +} + +//static +void LLMultiPreview::setAutoOpenInstance(LLMultiPreview* previewp, const LLUUID& id) +{ + if (previewp) + { + sAutoOpenPreviewHandles[id] = previewp->getHandle(); + } +}
\ No newline at end of file |