From 21a36e2c5b9dc98a1eca4a00088ea89f914d15b4 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 18 Nov 2014 12:15:30 +0100 Subject: MAINT-4677: Unexpected behaviour when blocking objects with a / in their name when using compact chat view --- doc/contributions.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 2d27562e37..5ae1306f3c 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -185,6 +185,7 @@ Ansariel Hiller BUG-3764 STORM-1984 STORM-1979 + MAINT-4677 Aralara Rajal Arare Chantilly CHUIBUG-191 -- cgit v1.3 From 38703d62e382bf7e57a0d3c2ab55714e99889e32 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Thu, 20 Nov 2014 08:37:55 -0500 Subject: STORM-2085 Spelling error and duplicate entry in notifications.xml --- doc/contributions.txt | 1 + indra/newview/skins/default/xui/en/notifications.xml | 13 +------------ 2 files changed, 2 insertions(+), 12 deletions(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 2d27562e37..72253a0d6f 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -717,6 +717,7 @@ Jonathan Yap STORM-2030 STORM-2034 STORM-2018 + STORM-2085 Kadah Coba STORM-1060 STORM-1843 diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index f1d34a1449..83384e0902 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -3792,17 +3792,6 @@ Leave Group? yestext="OK"/> - -Unable to leave group: [reason]. - reason - - - Unable to leave group: [reason]. -- cgit v1.3 From 44f5d7320952de2c4c7e1062b1c02c2f521400fa Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Thu, 20 Nov 2014 16:25:11 -0500 Subject: STORM-2086 Convert old style llinfos and llwarns to new format --- doc/contributions.txt | 1 + indra/linux_crash_logger/linux_crash_logger.cpp | 2 +- indra/llcommon/llerror.h | 9 --------- indra/llimage/llimagefilter.cpp | 2 +- indra/llprimitive/llmodel.cpp | 4 ++-- indra/llui/llkeywords.cpp | 14 +++++++------- indra/mac_crash_logger/mac_crash_logger.cpp | 2 +- indra/newview/llflickrconnect.cpp | 2 +- indra/newview/llfloatergroupbulkban.cpp | 2 +- indra/newview/lllogchat.cpp | 2 +- indra/newview/llpanelgroupbulk.cpp | 2 +- indra/newview/llpanelgroupinvite.cpp | 2 +- indra/newview/lltwitterconnect.cpp | 2 +- 13 files changed, 19 insertions(+), 27 deletions(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 2d27562e37..f64f29a559 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -717,6 +717,7 @@ Jonathan Yap STORM-2030 STORM-2034 STORM-2018 + STORM-2086 Kadah Coba STORM-1060 STORM-1843 diff --git a/indra/linux_crash_logger/linux_crash_logger.cpp b/indra/linux_crash_logger/linux_crash_logger.cpp index 36f62451d7..9d5ec33fed 100755 --- a/indra/linux_crash_logger/linux_crash_logger.cpp +++ b/indra/linux_crash_logger/linux_crash_logger.cpp @@ -42,7 +42,7 @@ int main(int argc, char **argv) if (!(options.has("pid") && options.has("dumpdir"))) { - llwarns << "Insufficient parameters to crash report." << llendl; + LL_WARNS() << "Insufficient parameters to crash report." << LL_ENDL; } if (! app.init()) diff --git a/indra/llcommon/llerror.h b/indra/llcommon/llerror.h index 63040e1772..73544cb914 100755 --- a/indra/llcommon/llerror.h +++ b/indra/llcommon/llerror.h @@ -362,13 +362,4 @@ typedef LLError::NoClassInfo _LL_CLASS_TO_LOG; #define LL_INFOS_ONCE(...) lllog(LLError::LEVEL_INFO, true, ##__VA_ARGS__) #define LL_WARNS_ONCE(...) lllog(LLError::LEVEL_WARN, true, ##__VA_ARGS__) -// DEPRECATED: Use the new macros that allow tags and *look* like macros. -#define lldebugs LL_COMPILE_TIME_MESSAGE("Warning: lldebugs deprecated, use LL_DEBUGS() instead") LL_DEBUGS() -#define llinfos LL_COMPILE_TIME_MESSAGE("Warning: llinfos deprecated, use LL_INFOS() instead") LL_INFOS() -#define llwarns LL_COMPILE_TIME_MESSAGE("Warning: llwarns deprecated, use LL_WARNS() instead") LL_WARNS() -#define llerrs LL_COMPILE_TIME_MESSAGE("Warning: llerrs deprecated, use LL_ERRS() instead") LL_ERRS() -#define llcont LL_COMPILE_TIME_MESSAGE("Warning: llcont deprecated, use LL_CONT instead") LL_CONT -#define llendl LL_COMPILE_TIME_MESSAGE("Warning: llendl deprecated, use LL_ENDL instead") LL_ENDL - - #endif // LL_LLERROR_H diff --git a/indra/llimage/llimagefilter.cpp b/indra/llimage/llimagefilter.cpp index 3d0c488768..0b9d136910 100755 --- a/indra/llimage/llimagefilter.cpp +++ b/indra/llimage/llimagefilter.cpp @@ -266,7 +266,7 @@ void LLImageFilter::executeFilter(LLPointer raw_image) } else { - llwarns << "Filter unknown, cannot execute filter command : " << filter_name << llendl; + LL_WARNS() << "Filter unknown, cannot execute filter command : " << filter_name << LL_ENDL; } } } diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp index b4963225dc..b19df0200d 100755 --- a/indra/llprimitive/llmodel.cpp +++ b/indra/llprimitive/llmodel.cpp @@ -172,7 +172,7 @@ LLModel::EModelStatus load_face_from_dom_triangles(std::vector& fa if (!pos_source) { - llwarns << "Unable to process mesh without position data; invalid model; invalid model." << llendl; + LL_WARNS() << "Unable to process mesh without position data; invalid model; invalid model." << LL_ENDL; return LLModel::BAD_ELEMENT; } @@ -193,7 +193,7 @@ LLModel::EModelStatus load_face_from_dom_triangles(std::vector& fa if ((vertex_count == 0) || (tc_count == 0)) { - llwarns << "Unable to process mesh with empty position array; invalid model." << llendl; + LL_WARNS() << "Unable to process mesh with empty position array; invalid model." << LL_ENDL; return LLModel::BAD_ELEMENT; } diff --git a/indra/llui/llkeywords.cpp b/indra/llui/llkeywords.cpp index 75773d7dfd..70d738d5ff 100755 --- a/indra/llui/llkeywords.cpp +++ b/indra/llui/llkeywords.cpp @@ -673,7 +673,7 @@ void LLKeywords::findSegments(std::vector* seg_list, const LLW S32 seg_start = cur - base; S32 seg_end = seg_start + seg_len; - // llinfos << "Seg: [" << word.c_str() << "]" << llendl; + // LL_INFOS("SyntaxLSL") << "Seg: [" << word.c_str() << "]" << LL_ENDL; insertSegments(wtext, *seg_list,cur_token, text_len, seg_start, seg_end, defaultColor, editor); } @@ -740,10 +740,10 @@ void LLKeywords::insertSegment(std::vector& seg_list, LLTextSe #ifdef _DEBUG void LLKeywords::dump() { - llinfos << "LLKeywords" << llendl; + LL_INFOS() << "LLKeywords" << LL_ENDL; - llinfos << "LLKeywords::sWordTokenMap" << llendl; + LL_INFOS() << "LLKeywords::sWordTokenMap" << LL_ENDL; word_token_map_t::iterator word_token_iter = mWordTokenMap.begin(); while( word_token_iter != mWordTokenMap.end() ) { @@ -752,7 +752,7 @@ void LLKeywords::dump() ++word_token_iter; } - llinfos << "LLKeywords::sLineTokenList" << llendl; + LL_INFOS() << "LLKeywords::sLineTokenList" << LL_ENDL; for (token_list_t::iterator iter = mLineTokenList.begin(); iter != mLineTokenList.end(); ++iter) { @@ -761,7 +761,7 @@ void LLKeywords::dump() } - llinfos << "LLKeywords::sDelimiterTokenList" << llendl; + LL_INFOS() << "LLKeywords::sDelimiterTokenList" << LL_ENDL; for (token_list_t::iterator iter = mDelimiterTokenList.begin(); iter != mDelimiterTokenList.end(); ++iter) { @@ -772,12 +772,12 @@ void LLKeywords::dump() void LLKeywordToken::dump() { - llinfos << "[" << + LL_INFOS() << "[" << mColor.mV[VX] << ", " << mColor.mV[VY] << ", " << mColor.mV[VZ] << "] [" << wstring_to_utf8str(mToken) << "]" << - llendl; + LL_ENDL; } #endif // DEBUG diff --git a/indra/mac_crash_logger/mac_crash_logger.cpp b/indra/mac_crash_logger/mac_crash_logger.cpp index d6b913829e..b65a80331e 100755 --- a/indra/mac_crash_logger/mac_crash_logger.cpp +++ b/indra/mac_crash_logger/mac_crash_logger.cpp @@ -41,7 +41,7 @@ int main(int argc, char **argv) if (!(options.has("pid") && options.has("dumpdir"))) { - llwarns << "Insufficient parameters to crash report." << llendl; + LL_WARNS() << "Insufficient parameters to crash report." << LL_ENDL; } if (! app.init()) diff --git a/indra/newview/llflickrconnect.cpp b/indra/newview/llflickrconnect.cpp index b715896264..b75660ea00 100644 --- a/indra/newview/llflickrconnect.cpp +++ b/indra/newview/llflickrconnect.cpp @@ -400,7 +400,7 @@ void LLFlickrConnect::uploadPhoto(LLPointer image, const std:: } else { - llwarns << "Image to upload is not a PNG or JPEG" << llendl; + LL_WARNS() << "Image to upload is not a PNG or JPEG" << LL_ENDL; return; } diff --git a/indra/newview/llfloatergroupbulkban.cpp b/indra/newview/llfloatergroupbulkban.cpp index 54a2283b13..44074047a7 100644 --- a/indra/newview/llfloatergroupbulkban.cpp +++ b/indra/newview/llfloatergroupbulkban.cpp @@ -101,7 +101,7 @@ void LLFloaterGroupBulkBan::showForGroup(const LLUUID& group_id, uuid_vec_t* age // Make sure group_id isn't null if (group_id.isNull()) { - llwarns << "LLFloaterGroupInvite::showForGroup with null group_id!" << llendl; + LL_WARNS() << "LLFloaterGroupInvite::showForGroup with null group_id!" << LL_ENDL; return; } diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp index 06e517a861..cadbc16f1e 100755 --- a/indra/newview/lllogchat.cpp +++ b/indra/newview/lllogchat.cpp @@ -1022,7 +1022,7 @@ void LLLoadHistoryThread::run() { loadHistory(mFileName, mMessages, mLoadParams); int count = mMessages->size(); - llinfos << "mMessages->size(): " << count << llendl; + LL_INFOS() << "mMessages->size(): " << count << LL_ENDL; setFinished(); } } diff --git a/indra/newview/llpanelgroupbulk.cpp b/indra/newview/llpanelgroupbulk.cpp index 1eafc5bd64..76792cc6fd 100644 --- a/indra/newview/llpanelgroupbulk.cpp +++ b/indra/newview/llpanelgroupbulk.cpp @@ -387,7 +387,7 @@ void LLPanelGroupBulk::addUsers(uuid_vec_t& agent_ids) } else { - llwarns << "llPanelGroupBulk: Selected avatar has no name: " << dest->getID() << llendl; + LL_WARNS() << "llPanelGroupBulk: Selected avatar has no name: " << dest->getID() << LL_ENDL; names.push_back("(Unknown)"); } } diff --git a/indra/newview/llpanelgroupinvite.cpp b/indra/newview/llpanelgroupinvite.cpp index 236ad861a5..e662a05dfc 100755 --- a/indra/newview/llpanelgroupinvite.cpp +++ b/indra/newview/llpanelgroupinvite.cpp @@ -492,7 +492,7 @@ void LLPanelGroupInvite::addUsers(uuid_vec_t& agent_ids) } else { - llwarns << "llPanelGroupInvite: Selected avatar has no name: " << dest->getID() << llendl; + LL_WARNS() << "llPanelGroupInvite: Selected avatar has no name: " << dest->getID() << LL_ENDL; names.push_back("(Unknown)"); } } diff --git a/indra/newview/lltwitterconnect.cpp b/indra/newview/lltwitterconnect.cpp index 7088558b83..e983bc883f 100644 --- a/indra/newview/lltwitterconnect.cpp +++ b/indra/newview/lltwitterconnect.cpp @@ -397,7 +397,7 @@ void LLTwitterConnect::uploadPhoto(LLPointer image, const std: } else { - llwarns << "Image to upload is not a PNG or JPEG" << llendl; + LL_WARNS() << "Image to upload is not a PNG or JPEG" << LL_ENDL; return; } -- cgit v1.3 From 41500add1e7dc392c9505fa544aca09b2954054f Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Fri, 21 Nov 2014 18:33:00 -0500 Subject: STORM-2082 Pulled in Oz's render weight changes --- doc/contributions.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 2d27562e37..36b9cf536d 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -717,6 +717,7 @@ Jonathan Yap STORM-2030 STORM-2034 STORM-2018 + STORM-2082 Kadah Coba STORM-1060 STORM-1843 -- cgit v1.3 From cacaf21eb5657065dc510bf245cf5fddb4f48a19 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Fri, 5 Dec 2014 09:46:07 -0500 Subject: STORM-2088 Minimap no longer remembers zoom setting between sessions --- doc/contributions.txt | 1 + indra/newview/llnetmap.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index ab5eddd92d..d071fc0c77 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -718,6 +718,7 @@ Jonathan Yap STORM-2030 STORM-2034 STORM-2018 + STORM-2088 Kadah Coba STORM-1060 STORM-1843 diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp index 1685a18e26..fbd9b127b6 100755 --- a/indra/newview/llnetmap.cpp +++ b/indra/newview/llnetmap.cpp @@ -97,13 +97,13 @@ LLNetMap::LLNetMap (const Params & p) mToolTipMsg(), mPopupMenu(NULL) { + mScale = gSavedSettings.getF32("MiniMapScale"); + mPixelsPerMeter = mScale / REGION_WIDTH_METERS; mDotRadius = llmax(DOT_SCALE * mPixelsPerMeter, MIN_DOT_RADIUS); - setScale(gSavedSettings.getF32("MiniMapScale")); } LLNetMap::~LLNetMap() { - gSavedSettings.setF32("MiniMapScale", mScale); } BOOL LLNetMap::postBuild() @@ -138,6 +138,8 @@ void LLNetMap::setScale( F32 scale ) mPixelsPerMeter = mScale / REGION_WIDTH_METERS; mDotRadius = llmax(DOT_SCALE * mPixelsPerMeter, MIN_DOT_RADIUS); + gSavedSettings.setF32("MiniMapScale", mScale); + mUpdateNow = true; } -- cgit v1.3 From 2d7fb5c67580620fd707b4fde3c497886e050dd1 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Sun, 28 Dec 2014 09:34:28 -0500 Subject: STORM-2094 Save button not activated if spelling corrected in Notecard and no other changes made --- doc/contributions.txt | 2 ++ indra/llui/lltextbase.cpp | 1 + indra/llui/lltextbase.h | 1 + indra/llui/lltexteditor.cpp | 8 ++++++++ indra/llui/lltexteditor.h | 2 ++ 5 files changed, 14 insertions(+) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 18acb18911..6087ecec4e 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -185,6 +185,7 @@ Ansariel Hiller BUG-3764 STORM-1984 STORM-1979 + STORM-2094 Aralara Rajal Arare Chantilly CHUIBUG-191 @@ -718,6 +719,7 @@ Jonathan Yap STORM-2030 STORM-2034 STORM-2018 + STORM-2094 Kadah Coba STORM-1060 STORM-1843 diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 9b125a85b9..e51f2a212f 100755 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -1316,6 +1316,7 @@ void LLTextBase::replaceWithSuggestion(U32 index) setCursorPos(it->first + (S32)suggestion.length()); + onSpellCheckPerformed(); break; } diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h index 738b4d5b8e..51fe904b4f 100755 --- a/indra/llui/lltextbase.h +++ b/indra/llui/lltextbase.h @@ -362,6 +362,7 @@ public: std::string getMisspelledWord(U32 pos) const; bool isMisspelledWord(U32 pos) const; void onSpellCheckSettingsChange(); + virtual void onSpellCheckPerformed(){} // used by LLTextSegment layout code bool getWordWrap() { return mWordWrap; } diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp index cf5fdef539..227b1f91a9 100755 --- a/indra/llui/lltexteditor.cpp +++ b/indra/llui/lltexteditor.cpp @@ -2380,6 +2380,14 @@ void LLTextEditor::removeTextFromEnd(S32 num_chars) //---------------------------------------------------------------------------- +void LLTextEditor::onSpellCheckPerformed() +{ + if (isPristine()) + { + mBaseDocIsPristine = FALSE; + } +} + void LLTextEditor::makePristine() { mPristineCmd = mLastCmd; diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h index f6bdf917b4..26702b2412 100755 --- a/indra/llui/lltexteditor.h +++ b/indra/llui/lltexteditor.h @@ -160,6 +160,8 @@ public: autoreplace_callback_t mAutoreplaceCallback; void setAutoreplaceCallback(autoreplace_callback_t cb) { mAutoreplaceCallback = cb; } + /*virtual*/ void onSpellCheckPerformed(); + // // Text manipulation // -- cgit v1.3 From a6dfe5a64ef984aa1a3169c72b490983662f899f Mon Sep 17 00:00:00 2001 From: Cinder Date: Sun, 28 Dec 2014 14:18:29 -0700 Subject: STORM-2098 - Don't enable object edit for an invalid agent --- doc/contributions.txt | 1 + indra/newview/llviewermenu.cpp | 2 ++ 2 files changed, 3 insertions(+) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 18acb18911..db9558e9a2 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -325,6 +325,7 @@ Cinder Roxley STORM-2036 STORM-2037 STORM-2053 + STORM-2098 Clara Young Coaldust Numbers VWR-1095 diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 3abeba4b43..e190119bcd 100755 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -2830,6 +2830,8 @@ BOOL enable_object_build(void*) bool enable_object_edit() { + if (!isAgentAvatarValid()) return false; + // *HACK: The new "prelude" Help Islands have a build sandbox area, // so users need the Edit and Create pie menu options when they are // there. Eventually this needs to be replaced with code that only -- cgit v1.3 From 4c96feb0e5b521275ce5298725b19833e0c42168 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Wed, 31 Dec 2014 07:20:52 -0500 Subject: STORM-2099 Minor formatting issue with logged out message --- doc/contributions.txt | 1 + indra/newview/skins/default/xui/en/notifications.xml | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 18acb18911..358ae03bee 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -718,6 +718,7 @@ Jonathan Yap STORM-2030 STORM-2034 STORM-2018 + STORM-2099 Kadah Coba STORM-1060 STORM-1843 diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index ea1bc66236..157cd94939 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -2463,8 +2463,9 @@ This is usually a temporary failure. Please customize and save the wearable agai icon="alertmodal.tga" name="YouHaveBeenLoggedOut" type="alertmodal"> -Darn. You have been logged out of [SECOND_LIFE] - [MESSAGE] +Darn. You have been logged out of [SECOND_LIFE]. + +[MESSAGE] Date: Tue, 6 Jan 2015 11:04:36 -0500 Subject: attribute STORM-2083 --- doc/contributions.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 3446cb982b..f099b24084 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -185,6 +185,7 @@ Ansariel Hiller BUG-3764 STORM-1984 STORM-1979 + STORM-2083 Aralara Rajal Arare Chantilly CHUIBUG-191 -- cgit v1.3 From c8a0aa99b4b879c4e22307a679053d4bd61dd9ff Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Wed, 18 Feb 2015 16:48:23 -0500 Subject: STORM-2082 Fix issue with isDirty --- doc/contributions.txt | 1 + indra/newview/llfloaterpreference.cpp | 62 +++++++++++------------------------ indra/newview/llfloaterpreference.h | 1 - 3 files changed, 21 insertions(+), 43 deletions(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 99d60dd73e..6e3dd70cb8 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -993,6 +993,7 @@ Nicky Dasmijn STORM-1937 OPEN-187 STORM-2010 + STORM-2082 Nicky Perian OPEN-1 STORM-1087 diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index d2dfb63f9d..4b45837ec0 100755 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -1172,7 +1172,7 @@ void LLFloaterPreferenceGraphicsAdvanced::refreshEnabledState() { LLComboBox* ctrl_reflections = getChild("Reflections"); LLTextBox* reflections_text = getChild("ReflectionsText"); - + // Reflections BOOL reflections = gSavedSettings.getBOOL("VertexShaderEnable") && gGLManager.mHasCubeMap @@ -1213,9 +1213,9 @@ void LLFloaterPreferenceGraphicsAdvanced::refreshEnabledState() // Vertex Shaders // Global Shader Enable LLCheckBoxCtrl* ctrl_shader_enable = getChild("BasicShaders"); - LLSliderCtrl* terrain_detail = getChild("TerrainDetail"); // can be linked with control var + LLSliderCtrl* terrain_detail = getChild("TerrainDetail"); // can be linked with control var LLTextBox* terrain_text = getChild("TerrainDetailText"); - + ctrl_shader_enable->setEnabled(LLFeatureManager::getInstance()->isFeatureAvailable("VertexShaderEnable")); BOOL shaders = ctrl_shader_enable->get(); @@ -1305,36 +1305,6 @@ void LLFloaterPreferenceGraphicsAdvanced::refreshEnabledState() getChildView("fog")->setEnabled(!gPipeline.canUseWindLightShaders()); getChildView("antialiasing restart")->setVisible(!LLFeatureManager::getInstance()->isFeatureAvailable("RenderDeferred")); - /* Disabling this block of code because canUseAntiAliasing currently always returns true - // anti-aliasing - LLComboBox* fsaa_ctrl = getChild("fsaa"); - LLTextBox* fsaa_text = getChild("antialiasing label"); - LLTextBox* fsaa_restart = getChild("antialiasing restart"); - - // Enable or disable the control, the "Antialiasing:" label and the restart warning - // based on code support for the feature on the current hardware. - - if (gPipeline.canUseAntiAliasing()) - { - fsaa_ctrl->setEnabled(TRUE); - - LLColor4 color = LLUIColorTable::instance().getColor("LabelTextColor"); - fsaa_text->setColor(color); - - fsaa_restart->setVisible(!gSavedSettings.getBOOL("RenderDeferred")); - } - else - { - fsaa_ctrl->setEnabled(FALSE); - fsaa_ctrl->setValue((LLSD::Integer) 0); - - LLColor4 color = LLUIColorTable::instance().getColor("LabelDisabledColor"); - fsaa_text->setColor(color); - - fsaa_restart->setVisible(FALSE); - } - */ - // now turn off any features that are unavailable disableUnavailableSettings(); @@ -1506,12 +1476,11 @@ void LLFloaterPreference::refresh() { LLPanel::refresh(); refreshEnabledState(); -} - -void LLFloaterPreferenceGraphicsAdvanced::draw() -{ - refresh(); - LLFloater::draw(); + LLFloater* advanced = LLFloaterReg::findTypedInstance("prefs_graphics_advanced"); + if (advanced) + { + advanced->refresh(); + } } void LLFloaterPreferenceGraphicsAdvanced::refresh() @@ -2182,7 +2151,10 @@ void LLPanelPreference::saveSettings() mSavedValues.clear(); std::list view_stack; view_stack.push_back(this); - view_stack.push_back(advanced); + if (advanced) + { + view_stack.push_back(advanced); + } while(!view_stack.empty()) { // Process view on top of the stack @@ -2410,7 +2382,10 @@ bool LLPanelPreferenceGraphics::hasDirtyChilds() LLFloater* advanced = LLFloaterReg::findTypedInstance("prefs_graphics_advanced"); std::list view_stack; view_stack.push_back(this); - view_stack.push_back(advanced); + if (advanced) + { + view_stack.push_back(advanced); + } while(!view_stack.empty()) { // Process view on top of the stack @@ -2449,7 +2424,10 @@ void LLPanelPreferenceGraphics::resetDirtyChilds() LLFloater* advanced = LLFloaterReg::findTypedInstance("prefs_graphics_advanced"); std::list view_stack; view_stack.push_back(this); - view_stack.push_back(advanced); + if (advanced) + { + view_stack.push_back(advanced); + } while(!view_stack.empty()) { // Process view on top of the stack diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h index cc3c85e340..a123e0502f 100755 --- a/indra/newview/llfloaterpreference.h +++ b/indra/newview/llfloaterpreference.h @@ -278,7 +278,6 @@ public: void updateSliderText(LLSliderCtrl* ctrl, LLTextBox* text_box); void updateImpostorsText(LLSliderCtrl* ctrl, LLTextBox* text_box); void updateMaximumArcText(LLSliderCtrl* ctrl, LLTextBox* text_box); - void draw(); void refresh(); // callback for when client turns on shaders void onVertexShaderEnable(); -- cgit v1.3 From 828f89f3a75552db6cf79d8b192afa260d3fc933 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 30 Jun 2015 16:46:49 -0400 Subject: correct labels for rendering choices for STORM-2107 --- doc/contributions.txt | 1 + indra/newview/llviewermenu.cpp | 12 ++++++------ indra/newview/llvoavatar.cpp | 8 ++++---- indra/newview/llvoavatar.h | 6 +++--- indra/newview/skins/default/xui/en/menu_avatar_other.xml | 12 ++++++------ 5 files changed, 20 insertions(+), 19 deletions(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 4cf51b3d13..53df40d172 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -1238,6 +1238,7 @@ Sovereign Engineer OPEN-195 OPEN-217 OPEN-295 + STORM-2107 SpacedOut Frye VWR-34 VWR-45 diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index cf44a5c69b..482ae76613 100755 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -2991,11 +2991,11 @@ class LLAvatarCheckImpostorMode : public view_listener_t switch (mode) { case 0: - return (avatar->getVisualMuteSettings() == LLVOAvatar::VISUAL_MUTE_NOT_SET); + return (avatar->getVisualMuteSettings() == LLVOAvatar::AV_RENDER_NORMALLY); case 1: - return (avatar->getVisualMuteSettings() == LLVOAvatar::ALWAYS_VISUAL_MUTE); + return (avatar->getVisualMuteSettings() == LLVOAvatar::AV_DO_NOT_RENDER); case 2: - return (avatar->getVisualMuteSettings() == LLVOAvatar::NEVER_VISUAL_MUTE); + return (avatar->getVisualMuteSettings() == LLVOAvatar::AV_ALWAYS_RENDER); default: return false; } @@ -3017,13 +3017,13 @@ class LLAvatarSetImpostorMode : public view_listener_t switch (mode) { case 0: - avatar->setVisualMuteSettings(LLVOAvatar::VISUAL_MUTE_NOT_SET); + avatar->setVisualMuteSettings(LLVOAvatar::AV_RENDER_NORMALLY); break; case 1: - avatar->setVisualMuteSettings(LLVOAvatar::ALWAYS_VISUAL_MUTE); + avatar->setVisualMuteSettings(LLVOAvatar::AV_DO_NOT_RENDER); break; case 2: - avatar->setVisualMuteSettings(LLVOAvatar::NEVER_VISUAL_MUTE); + avatar->setVisualMuteSettings(LLVOAvatar::AV_ALWAYS_RENDER); break; default: return false; diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index e29cc7147c..3106e2b6d1 100755 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -699,7 +699,7 @@ LLVOAvatar::LLVOAvatar(const LLUUID& id, mLastSkinTime(0.f), mUpdatePeriod(1), mVisualComplexityStale(true), - mVisuallyMuteSetting(VISUAL_MUTE_NOT_SET), + mVisuallyMuteSetting(AV_RENDER_NORMALLY), mMutedAVColor(calcMutedAVColor(getID())), mFirstFullyVisible(TRUE), mFullyLoaded(FALSE), @@ -3088,11 +3088,11 @@ bool LLVOAvatar::isVisuallyMuted() const // * check against the render cost and attachment limits if (!isSelf()) { - if (mVisuallyMuteSetting == NEVER_VISUAL_MUTE) + if (mVisuallyMuteSetting == AV_ALWAYS_RENDER) { muted = false; } - else if (mVisuallyMuteSetting == ALWAYS_VISUAL_MUTE) + else if (mVisuallyMuteSetting == AV_DO_NOT_RENDER) { // Always want to see this AV as an impostor muted = true; } @@ -8082,7 +8082,7 @@ void LLVOAvatar::updateImpostors() LLVOAvatar* avatar = (LLVOAvatar*) *iter; if (!avatar->isDead() && avatar->isVisible() && (avatar->isImpostor() && avatar->needsImpostorUpdate()) - && (avatar->getVisualMuteSettings() != ALWAYS_VISUAL_MUTE)) + && (avatar->getVisualMuteSettings() != AV_DO_NOT_RENDER)) { gPipeline.generateImpostor(avatar); } diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index 1b6809f6c7..a49aa73035 100755 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -388,9 +388,9 @@ public: enum VisualMuteSettings { - VISUAL_MUTE_NOT_SET = 0, - ALWAYS_VISUAL_MUTE = 1, - NEVER_VISUAL_MUTE = 2 + AV_RENDER_NORMALLY = 0, + AV_DO_NOT_RENDER = 1, + AV_ALWAYS_RENDER = 2 }; void setVisualMuteSettings(VisualMuteSettings set) { mVisuallyMuteSetting = set; }; VisualMuteSettings getVisualMuteSettings() { return mVisuallyMuteSetting; }; diff --git a/indra/newview/skins/default/xui/en/menu_avatar_other.xml b/indra/newview/skins/default/xui/en/menu_avatar_other.xml index cfbbe41f95..9d882aaf37 100755 --- a/indra/newview/skins/default/xui/en/menu_avatar_other.xml +++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml @@ -106,8 +106,8 @@ + name="Render Normally" + label="Render Normally"> @@ -116,8 +116,8 @@ parameter="0" /> + name="DoNotRender" + label="Do Not Render"> @@ -126,8 +126,8 @@ parameter="1" /> + name="AlwaysRenderFully" + label="Always Render Fully"> -- cgit v1.3