diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-07-02 12:38:07 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-07-02 12:38:07 -0400 |
| commit | ed5b46c9b0f71b458f8dd58a9c76ae51f974726b (patch) | |
| tree | e48c8a1dbe48157798d0625c6d54606b25ebc208 | |
| parent | 9b1208e4958859e2328ce60acc4d8efaa5dbeed2 (diff) | |
| parent | 077e851bdd8e46fa9d5a43712dacdf5945a979f7 (diff) | |
merge back changes from 3.3.4-beta2
| -rw-r--r-- | .hgtags | 5 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llavatariconctrl.cpp | 0 | ||||
| -rw-r--r-- | indra/newview/llmarketplacefunctions.cpp | 8 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llmeshrepository.cpp | 0 | ||||
| -rw-r--r-- | indra/newview/lltexturectrl.cpp | 5 |
5 files changed, 16 insertions, 2 deletions
@@ -331,3 +331,8 @@ af5f3e43e6e4424b1da19d9e16f6b853a7b822ed DRTVWR-169 005dfe5c4c377207d065fb27858d2eb0b53b143a DRTVWR-167 f87bfbe0b62d26f451d02a47c80ebef6b9168fc2 3.3.4-beta1 f87bfbe0b62d26f451d02a47c80ebef6b9168fc2 DRTVWR-158 +f87bfbe0b62d26f451d02a47c80ebef6b9168fc2 3.3.4-beta1 +cbea6356ce9cb0c313b6777f10c5c14783264fcc DRTVWR-174 +bce218b2b45b730b22cc51e4807aa8b571cadef3 DRTVWR-173 +f91d003091a61937a044652c4c674447f7dcbb7a 3.3.4-beta1 +82b5330bc8b17d0d4b598832e9c5a92e90075682 3.3.4-beta2 diff --git a/indra/newview/llavatariconctrl.cpp b/indra/newview/llavatariconctrl.cpp index b539ac38ed..b539ac38ed 100644..100755 --- a/indra/newview/llavatariconctrl.cpp +++ b/indra/newview/llavatariconctrl.cpp diff --git a/indra/newview/llmarketplacefunctions.cpp b/indra/newview/llmarketplacefunctions.cpp index 93dd82957f..51df868faa 100644 --- a/indra/newview/llmarketplacefunctions.cpp +++ b/indra/newview/llmarketplacefunctions.cpp @@ -336,13 +336,19 @@ namespace LLMarketplaceImport // Interface class // +static const F32 MARKET_IMPORTER_UPDATE_FREQUENCY = 1.0f; //static void LLMarketplaceInventoryImporter::update() { if (instanceExists()) { - LLMarketplaceInventoryImporter::instance().updateImport(); + static LLTimer update_timer; + if (update_timer.hasExpired()) + { + LLMarketplaceInventoryImporter::instance().updateImport(); + update_timer.setTimerExpirySec(MARKET_IMPORTER_UPDATE_FREQUENCY); + } } } diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index bc7f522848..bc7f522848 100644..100755 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index 6703ef4a41..ec36cf48c2 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -819,7 +819,10 @@ void LLFloaterTexturePicker::onSelectionChange(const std::deque<LLFolderViewItem mNoCopyTextureSelected = FALSE; if (itemp) { - mTextureSelectedCallback(itemp); + if (!mTextureSelectedCallback.empty()) + { + mTextureSelectedCallback(itemp); + } if (!itemp->getPermissions().allowCopyBy(gAgent.getID())) { mNoCopyTextureSelected = TRUE; |