aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/floaterlocalassetbrowse.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2010-09-03 23:00:36 -0500
committerMcCabe Maxsted2010-09-03 23:21:44 -0700
commit22cc562720022684340bd80a66292ee3fd0f8dac (patch)
treee8a26c70cf2f60f7aaa64ad21e1b6eaca257600d /linden/indra/newview/floaterlocalassetbrowse.cpp
parentPreload default avatar eyes and hair textures. (diff)
downloadmeta-impy-22cc562720022684340bd80a66292ee3fd0f8dac.zip
meta-impy-22cc562720022684340bd80a66292ee3fd0f8dac.tar.gz
meta-impy-22cc562720022684340bd80a66292ee3fd0f8dac.tar.bz2
meta-impy-22cc562720022684340bd80a66292ee3fd0f8dac.tar.xz
Fixed several issues with the local asset browser.
* Enable "Keep Updating" by default. * Fixed the "Keep Updating" checkbox not toggling correctly. * Fixed the upload fee label (it was showing currency symbol).
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/floaterlocalassetbrowse.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/linden/indra/newview/floaterlocalassetbrowse.cpp b/linden/indra/newview/floaterlocalassetbrowse.cpp
index 337a5e6..0ff24ca 100644
--- a/linden/indra/newview/floaterlocalassetbrowse.cpp
+++ b/linden/indra/newview/floaterlocalassetbrowse.cpp
@@ -106,8 +106,8 @@ LocalBitmap::LocalBitmap(std::string fullpath)
106 /* taking care of basic properties */ 106 /* taking care of basic properties */
107 this->id.generate(); 107 this->id.generate();
108 this->filename = fullpath; 108 this->filename = fullpath;
109 this->linkstatus = LINK_OFF; 109 this->linkstatus = LINK_ON;
110 this->keep_updating = false; 110 this->keep_updating = true;
111 this->shortname = gDirUtilp->getBaseFileName(this->filename, true); 111 this->shortname = gDirUtilp->getBaseFileName(this->filename, true);
112 this->bitmap_type = TYPE_TEXTURE; 112 this->bitmap_type = TYPE_TEXTURE;
113 this->sculpt_dirty = false; 113 this->sculpt_dirty = false;
@@ -791,8 +791,8 @@ FloaterLocalAssetBrowser::FloaterLocalAssetBrowser()
791 // checkbox callbacks 791 // checkbox callbacks
792 mUpdateChkBox->setCommitCallback(onClickUpdateChkbox); 792 mUpdateChkBox->setCommitCallback(onClickUpdateChkbox);
793 793
794 mUpdateChkBox->set(true); 794 mUpdateChkBox->set(false);
795 mUploadBtn->setLabelArg("[UPLOADFEE]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol()); 795 mUploadBtn->setLabelArg("[UPLOADFEE]", gHippoGridManager->getConnectedGrid()->getUploadFee());
796} 796}
797 797
798void FloaterLocalAssetBrowser::show(void*) 798void FloaterLocalAssetBrowser::show(void*)
@@ -915,7 +915,6 @@ void FloaterLocalAssetBrowser::UpdateRightSide()
915 sLFInstance->mTypeComboBox->selectNthItem( unit->getType() ); 915 sLFInstance->mTypeComboBox->selectNthItem( unit->getType() );
916 916
917 sLFInstance->mTextureView->setEnabled(true); 917 sLFInstance->mTextureView->setEnabled(true);
918 sLFInstance->mUpdateChkBox->set(true);
919 sLFInstance->mUpdateChkBox->setEnabled(true); 918 sLFInstance->mUpdateChkBox->setEnabled(true);
920 sLFInstance->mTypeComboBox->setEnabled(true); 919 sLFInstance->mTypeComboBox->setEnabled(true);
921 } 920 }
@@ -924,7 +923,6 @@ void FloaterLocalAssetBrowser::UpdateRightSide()
924 { 923 {
925 sLFInstance->mTextureView->setImageAssetID( NO_IMAGE ); 924 sLFInstance->mTextureView->setImageAssetID( NO_IMAGE );
926 sLFInstance->mTextureView->setEnabled( false ); 925 sLFInstance->mTextureView->setEnabled( false );
927 sLFInstance->mUpdateChkBox->set( false );
928 sLFInstance->mUpdateChkBox->setEnabled( false ); 926 sLFInstance->mUpdateChkBox->setEnabled( false );
929 927
930 sLFInstance->mTypeComboBox->selectFirstItem(); 928 sLFInstance->mTypeComboBox->selectFirstItem();