From 8d0a51471236d6edc8c554096d81c471ca72c5ab Mon Sep 17 00:00:00 2001 From: Shyotl Date: Wed, 19 Jun 2013 03:32:33 -0500 Subject: [PATCH] Added missing setting. Fixed login grid combobox. Using skin-dependent scrolllist text color in nearbymedia panel. Fixed media face toggle not triggering face rebuild. Added incon that was missed in previous commits. bar_stack layout panels were incorrectly resizeable. Fixed comboboxes/scrolllists in panel_nearby_media.xml translations --- indra/newview/app_settings/settings.xml | 11 +++++++++++ indra/newview/hippopanelgrids.cpp | 4 ++-- indra/newview/llpanellogin.cpp | 6 +++--- indra/newview/llpanelnearbymedia.cpp | 9 +++++---- indra/newview/llviewerobject.h | 2 +- .../default/textures/Parcel_Exp_Color.png | Bin 0 -> 272 bytes .../default/xui/en-us/panel_overlaybar.xml | 4 ++-- .../default/xui/es/panel_nearby_media.xml | 18 +++++++++--------- .../default/xui/fr/panel_nearby_media.xml | 18 +++++++++--------- .../default/xui/pt/panel_nearby_media.xml | 18 +++++++++--------- 10 files changed, 51 insertions(+), 39 deletions(-) create mode 100644 indra/newview/skins/default/textures/Parcel_Exp_Color.png diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index d7ce62765..ededd2462 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -8802,6 +8802,17 @@ This should be as low as possible, but too low may break functionality Value 0 + LastMediaSettingsTab + + Comment + Last selected tab in media settings window + Persist + 1 + Type + S32 + Value + 0 + LastRunVersion Comment diff --git a/indra/newview/hippopanelgrids.cpp b/indra/newview/hippopanelgrids.cpp index 6af943c5b..c5fe98de2 100644 --- a/indra/newview/hippopanelgrids.cpp +++ b/indra/newview/hippopanelgrids.cpp @@ -164,7 +164,7 @@ BOOL HippoPanelGridsImpl::postBuild() // called internally too void HippoPanelGridsImpl::refresh() { - const std::string &defaultGrid = gHippoGridManager->getDefaultGridNick(); + const std::string &defaultGrid = gHippoGridManager->getDefaultGridName(); LLComboBox *grids = getChild("grid_selector"); S32 selectIndex = -1, i = 0; @@ -365,7 +365,7 @@ bool HippoPanelGridsImpl::saveCurGrid() void HippoPanelGridsImpl::reset() { mState = NORMAL; - mCurGrid = gHippoGridManager->getCurrentGridNick(); + mCurGrid = gHippoGridManager->getCurrentGridName(); loadCurGrid(); } diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 1bbb0416b..e6fed8486 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -810,14 +810,14 @@ void LLPanelLogin::updateGridCombo() std::string grid = it->second->getGridName(); if(grid.empty() || it->second == defGrid || it->second == curGrid) continue; - grids->add(grid,it->second->getGridNick()); + grids->add(grid); } if(curGrid || defGrid) { if(defGrid) - grids->add(defGrid->getGridName(),defGrid->getGridNick(),ADD_TOP); + grids->add(defGrid->getGridName(),ADD_TOP); if(curGrid && defGrid != curGrid) - grids->add(curGrid->getGridName(),curGrid->getGridNick(),ADD_TOP); + grids->add(curGrid->getGridName(),ADD_TOP); grids->setCurrentByIndex(0); } else diff --git a/indra/newview/llpanelnearbymedia.cpp b/indra/newview/llpanelnearbymedia.cpp index 0c7d3990d..9438dfa79 100644 --- a/indra/newview/llpanelnearbymedia.cpp +++ b/indra/newview/llpanelnearbymedia.cpp @@ -478,7 +478,7 @@ void LLPanelNearByMedia::updateListItem(LLScrollListItem* item, // *TODO: Make these font styles/colors configurable via XUI U8 font_style = LLFontGL::NORMAL; - LLColor4 cell_color = LLColor4::black; + LLColor4 cell_color = LLUI::sColorsGroup->getColor("DefaultListText"); // Only colorize by class in debug if (mDebugInfoVisible) @@ -503,7 +503,7 @@ void LLPanelNearByMedia::updateListItem(LLScrollListItem* item, if (mDebugInfoVisible) { font_style |= LLFontGL::ITALIC; - cell_color = LLColor4::black; + cell_color = LLUI::sColorsGroup->getColor("DefaultListText"); } else { // Dim it if it is disabled @@ -973,7 +973,7 @@ void LLPanelNearByMedia::onAdvancedButtonClick() LLTabContainer* tabcontainer = prefsfloater->getChild("pref core"); if (tabcontainer) { - tabcontainer->selectTabByName("Media Panel"); + tabcontainer->selectTabByName("Media panel"); } } } @@ -984,7 +984,8 @@ void LLPanelNearByMedia::onMoreLess() mNearbyMediaPanel->setVisible(is_more); // enable resizing when expanded - getChildView("resizebar_bottom")->setEnabled(is_more); + if(mStandalonePanel) + getChildView("resizebar_bottom")->setEnabled(is_more); LLRect new_rect = is_more ? mMoreRect : mLessRect; new_rect.translate(getRect().mRight - new_rect.mRight, getRect().mTop - new_rect.mTop); diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index 12aea19c1..5935942b6 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -325,7 +325,7 @@ public: /*virtual*/ S32 setTEGlow(const U8 te, const F32 glow); /*virtual*/ BOOL setMaterial(const U8 material); virtual void setTEImage(const U8 te, LLViewerTexture *imagep); // Not derived from LLPrimitive - void changeTEImage(S32 index, LLViewerTexture* new_image) ; + virtual void changeTEImage(S32 index, LLViewerTexture* new_image) ; LLViewerTexture *getTEImage(const U8 te) const; void fitFaceTexture(const U8 face); diff --git a/indra/newview/skins/default/textures/Parcel_Exp_Color.png b/indra/newview/skins/default/textures/Parcel_Exp_Color.png new file mode 100644 index 0000000000000000000000000000000000000000..4813d37198356805ef1c67724adae778fec9a442 GIT binary patch literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^LO?9Q!3HFy+4N(8lw^r(L`iUdT1k0gQ7VIDN`6wR zf@f}GdTLN=VoGJ<$y6JlqD`JIjv*DdlK%YvZ+}=bGPI73t&P{=%>f4~3x*?%Y5n>2 zDNS4xk~x?|_&xNQxhFBOG2Ci7#J)>rdLoYxPYBZ&!xzsdFE9AEef9N|<}W^foLunj z_uSn;=3l;+XZ{{-lX3($Jv*=N_t3P1b^eq4=jR`6`}_AxXF|eefuIj*U#%7;@ve82 zT0PC+L*%UHn@S5EdCU(bv02DYWQv$jWaw6R__^p7A%=I07-le79_8p@6i8rLTW$7g TXCwnB(De+Su6{1-oD!M<1-fWd literal 0 HcmV?d00001 diff --git a/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml b/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml index a10f0b74a..c9687b8c6 100644 --- a/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml +++ b/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml @@ -1,6 +1,6 @@ + user_resize="false" name="overlay" use_bounding_rect="true" width="728"> @@ -44,7 +44,7 @@ diff --git a/indra/newview/skins/default/xui/es/panel_nearby_media.xml b/indra/newview/skins/default/xui/es/panel_nearby_media.xml index 8d4f9eda1..ba1cc48b0 100644 --- a/indra/newview/skins/default/xui/es/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/es/panel_nearby_media.xml @@ -30,17 +30,17 @@ Mostrar: - - - - + Todo + Fuera de la parcela + En otros avatares - - - - - + + + + + diff --git a/indra/newview/skins/default/xui/fr/panel_nearby_media.xml b/indra/newview/skins/default/xui/fr/panel_nearby_media.xml index 7b7b67041..010f24a60 100644 --- a/indra/newview/skins/default/xui/fr/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/fr/panel_nearby_media.xml @@ -30,17 +30,17 @@ Voir : - - - - + Tout + Sur cette parcelle + En dehors de la parcelle + Sur les autres avatars - - - - - + + + + + diff --git a/indra/newview/skins/default/xui/pt/panel_nearby_media.xml b/indra/newview/skins/default/xui/pt/panel_nearby_media.xml index 43bf8f966..4eb292960 100644 --- a/indra/newview/skins/default/xui/pt/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/pt/panel_nearby_media.xml @@ -30,17 +30,17 @@ Mostrar: - - - - + Tudo + Neste lote + Fora deste lote + Nos outros avatares - - - - - + + + + +