From b165492945d4a9b13a594ec626e49482da9635b1 Mon Sep 17 00:00:00 2001 From: Dmitry Zaporozhan Date: Mon, 28 Dec 2009 13:19:15 +0200 Subject: Fixed normal bug EXT-2791 - Upload Image / sound / animation missing cost. --HG-- branch : product-engine --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index ba78d80ad1..bf69986094 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2344,6 +2344,17 @@ Value 89556747-24cb-43ed-920b-47caed15465f + DefaultUploadCost + + Comment + Default sound/image/file upload cost(in case economy data is not available). + Persist + 1 + Type + U32 + Value + 10 + DisableCameraConstraints Comment -- cgit v1.3 From 904de223b6da701e2512b8d8bf0d3be478421c78 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Tue, 29 Dec 2009 18:18:52 -0700 Subject: for DEV-44376: create a switch for texture decoding. --- indra/newview/app_settings/settings.xml | 11 +++++++++++ indra/newview/lltexturefetch.cpp | 9 +++++++++ indra/newview/llviewertexture.cpp | 6 ++++++ 3 files changed, 26 insertions(+) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index ba78d80ad1..7296c5d947 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -8727,6 +8727,17 @@ Value 20.0 + TextureDecodeDisabled + + Comment + If TRUE, do not fetch and decode any textures + Persist + 1 + Type + Boolean + Value + 0 + TextureDisable Comment diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index a75f631769..eeedf38543 100644 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -962,6 +962,15 @@ bool LLTextureFetchWorker::doWork(S32 param) if (mState == DECODE_IMAGE) { + static LLCachedControl textures_decode_disabled(gSavedSettings,"TextureDecodeDisabled"); + if(textures_decode_disabled) + { + // for debug use, don't decode + mState = DONE; + setPriority(LLWorkerThread::PRIORITY_LOW | mWorkPriority); + return true; + } + if (mDesiredDiscard < 0) { // We aborted, don't decode diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index dffd654a70..b1ad01f54f 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -1591,6 +1591,12 @@ void LLViewerFetchedTexture::updateVirtualSize() bool LLViewerFetchedTexture::updateFetch() { + static LLCachedControl textures_decode_disabled(gSavedSettings,"TextureDecodeDisabled"); + if(textures_decode_disabled) + { + return false ; + } + mFetchState = 0; mFetchPriority = 0; mFetchDeltaTime = 999999.f; -- cgit v1.3 From 4e901957f9414284fa26ca70122f952243e4122c Mon Sep 17 00:00:00 2001 From: James Cook Date: Wed, 30 Dec 2009 15:46:53 -0800 Subject: EXT-3753 Made inventory subfolders indent more. Changed back to 8 pixel indent, as Ben Glenn was seeing confusion in user tests with lesser indents. Made it a setting, FolderIndentation in case we want to change in the future. Reviewed with Leyla. --- indra/newview/app_settings/settings.xml | 11 +++++++++++ indra/newview/llfolderview.cpp | 3 ++- indra/newview/llfolderviewitem.cpp | 3 ++- indra/newview/llfolderviewitem.h | 3 +-- 4 files changed, 16 insertions(+), 4 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 0ee39c2fc8..55db13e44a 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3235,6 +3235,17 @@ Value 0.75 + FolderIndentation + + Comment + Number of pixels to indent subfolders in inventory + Persist + 1 + Type + S32 + Value + 8 + FolderLoadingMessageWaitTime Comment diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index 474d2ca21f..112b23d2df 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -206,7 +206,8 @@ LLFolderView::LLFolderView(const Params& p) mAutoOpenCandidate = NULL; mAutoOpenTimer.stop(); mKeyboardSelection = FALSE; - mIndentation = -LEFT_INDENTATION; // children start at indentation 0 + static LLUICachedControl indentation("FolderIndentation", 0); + mIndentation = -indentation; // children start at indentation 0 gIdleCallbacks.addFunction(idle, this); //clear label diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp index 720c2c7b1a..9d54aafd67 100644 --- a/indra/newview/llfolderviewitem.cpp +++ b/indra/newview/llfolderviewitem.cpp @@ -392,10 +392,11 @@ BOOL LLFolderViewItem::addToFolder(LLFolderViewFolder* folder, LLFolderView* roo // makes sure that this view and it's children are the right size. S32 LLFolderViewItem::arrange( S32* width, S32* height, S32 filter_generation) { + static LLUICachedControl indentation("FolderIndentation", 0); mIndentation = (getParentFolder() && getParentFolder()->getParentFolder() && getParentFolder()->getParentFolder()->getParentFolder()) - ? mParentFolder->getIndentation() + LEFT_INDENTATION + ? mParentFolder->getIndentation() + indentation : 0; if (mLabelWidthDirty) { diff --git a/indra/newview/llfolderviewitem.h b/indra/newview/llfolderviewitem.h index 21e24c2a4d..6f8c738a59 100644 --- a/indra/newview/llfolderviewitem.h +++ b/indra/newview/llfolderviewitem.h @@ -93,7 +93,6 @@ public: static void initClass(); static void cleanupClass(); - // jamesdebug was LLUICtrl::Params struct Params : public LLInitParam::Block { Optional icon; @@ -111,7 +110,7 @@ public: // layout constants static const S32 LEFT_PAD = 5; - static const S32 LEFT_INDENTATION = 2; + // LEFT_INDENTATION is set via settings.xml FolderIndentation static const S32 ICON_PAD = 2; static const S32 ICON_WIDTH = 16; static const S32 TEXT_PAD = 1; -- cgit v1.3 From 8dec87c2ecbf2fe3d3c48d83722d5ee0acc8f53f Mon Sep 17 00:00:00 2001 From: James Cook Date: Wed, 30 Dec 2009 16:47:25 -0800 Subject: EXT-1399 Restore some wind noise when standing still, but drop volume Make wind volume configurable via setting AudioLevelWind, currently set to 0.5. Changing this to 1.0 will restore the viewer 1.23 behavior Reviewed with Leyla. --- indra/newview/app_settings/settings.xml | 11 +++++++++++ indra/newview/llvieweraudio.cpp | 24 ++++++++++++++++++------ 2 files changed, 29 insertions(+), 6 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 55db13e44a..e24e1a8605 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -264,6 +264,17 @@ F32 Value 0.5 + + AudioLevelWind + + Comment + Audio level of wind noise when standing still + Persist + 1 + Type + F32 + Value + 0.5 AudioSteamingMedia diff --git a/indra/newview/llvieweraudio.cpp b/indra/newview/llvieweraudio.cpp index e7f904023a..38103f9e41 100644 --- a/indra/newview/llvieweraudio.cpp +++ b/indra/newview/llvieweraudio.cpp @@ -211,19 +211,31 @@ void audio_update_wind(bool force_update) // if (force_update || (last_camera_water_height * camera_water_height) < 0.f) { + static LLUICachedControl rolloff("AudioLevelRolloff", 1.0f); if (camera_water_height < 0.f) { - gAudiop->setRolloffFactor(gSavedSettings.getF32("AudioLevelRolloff") * LL_ROLLOFF_MULTIPLIER_UNDER_WATER); + gAudiop->setRolloffFactor(rolloff * LL_ROLLOFF_MULTIPLIER_UNDER_WATER); } else { - gAudiop->setRolloffFactor(gSavedSettings.getF32("AudioLevelRolloff")); + gAudiop->setRolloffFactor(rolloff); } } - // this line rotates the wind vector to be listener (agent) relative - // Only use the agent's motion to compute wind noise, otherwise the world - // feels desolate on login when you are standing still. - gRelativeWindVec = gAgent.getFrameAgent().rotateToLocal( -gAgent.getVelocity() ); + + // Scale down the contribution of weather-simulation wind to the + // ambient wind noise. Wind velocity averages 3.5 m/s, with gusts to 7 m/s + // whereas steady-state avatar walk velocity is only 3.2 m/s. + // Without this the world feels desolate on first login when you are + // standing still. + static LLUICachedControl wind_level("AudioLevelWind", 0.5f); + LLVector3 scaled_wind_vec = gWindVec * wind_level; + + // Mix in the avatar's motion, subtract because when you walk north, + // the apparent wind moves south. + LLVector3 final_wind_vec = scaled_wind_vec - gAgent.getVelocity(); + + // rotate the wind vector to be listener (agent) relative + gRelativeWindVec = gAgent.getFrameAgent().rotateToLocal( final_wind_vec ); // don't use the setter setMaxWindGain() because we don't // want to screw up the fade-in on startup by setting actual source gain -- cgit v1.3