From 22cc562720022684340bd80a66292ee3fd0f8dac Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 3 Sep 2010 23:00:36 -0500
Subject: 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).
---
 linden/indra/newview/floaterlocalassetbrowse.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'linden')

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)
 		/* taking care of basic properties */
 		this->id.generate();
 		this->filename	    = fullpath;
-		this->linkstatus    = LINK_OFF;
-		this->keep_updating = false;
+		this->linkstatus    = LINK_ON;
+		this->keep_updating = true;
 		this->shortname     = gDirUtilp->getBaseFileName(this->filename, true);
 		this->bitmap_type   = TYPE_TEXTURE;
 		this->sculpt_dirty  = false;
@@ -791,8 +791,8 @@ FloaterLocalAssetBrowser::FloaterLocalAssetBrowser()
 	// checkbox callbacks
 	mUpdateChkBox->setCommitCallback(onClickUpdateChkbox);
 
-	mUpdateChkBox->set(true);
-	mUploadBtn->setLabelArg("[UPLOADFEE]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
+	mUpdateChkBox->set(false);
+	mUploadBtn->setLabelArg("[UPLOADFEE]", gHippoGridManager->getConnectedGrid()->getUploadFee());
 }
 
 void FloaterLocalAssetBrowser::show(void*)
@@ -915,7 +915,6 @@ void FloaterLocalAssetBrowser::UpdateRightSide()
 			sLFInstance->mTypeComboBox->selectNthItem( unit->getType() );
 
 			sLFInstance->mTextureView->setEnabled(true);
-			sLFInstance->mUpdateChkBox->set(true);
 			sLFInstance->mUpdateChkBox->setEnabled(true);
 			sLFInstance->mTypeComboBox->setEnabled(true);
 		}
@@ -924,7 +923,6 @@ void FloaterLocalAssetBrowser::UpdateRightSide()
 	{
 		sLFInstance->mTextureView->setImageAssetID( NO_IMAGE );
 		sLFInstance->mTextureView->setEnabled( false );
-		sLFInstance->mUpdateChkBox->set( false );
 		sLFInstance->mUpdateChkBox->setEnabled( false );
 
 		sLFInstance->mTypeComboBox->selectFirstItem();
-- 
cgit v1.1