Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Shyotl
2013-06-19 03:32:33 -05:00
parent 49cbc80ee0
commit 8d0a514712
10 changed files with 51 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/app_settings/settings.xml
View File

@@ -8802,6 +8802,17 @@ This should be as low as possible, but too low may break functionality</string>
<key>Value</key> <key>Value</key>
<integer>0</integer> <integer>0</integer>
</map> </map>
<key>LastMediaSettingsTab</key>
<map>
<key>Comment</key>
<string>Last selected tab in media settings window</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>LastRunVersion</key> <key>LastRunVersion</key>
<map> <map>
<key>Comment</key> <key>Comment</key>

4
indra/newview/hippopanelgrids.cpp
View File

@@ -164,7 +164,7 @@ BOOL HippoPanelGridsImpl::postBuild()
// called internally too // called internally too
void HippoPanelGridsImpl::refresh() void HippoPanelGridsImpl::refresh()
{ {
const std::string &defaultGrid = gHippoGridManager->getDefaultGridNick(); const std::string &defaultGrid = gHippoGridManager->getDefaultGridName();
LLComboBox *grids = getChild<LLComboBox>("grid_selector"); LLComboBox *grids = getChild<LLComboBox>("grid_selector");
S32 selectIndex = -1, i = 0; S32 selectIndex = -1, i = 0;
@@ -365,7 +365,7 @@ bool HippoPanelGridsImpl::saveCurGrid()
void HippoPanelGridsImpl::reset() void HippoPanelGridsImpl::reset()
{ {
mState = NORMAL; mState = NORMAL;
mCurGrid = gHippoGridManager->getCurrentGridNick(); mCurGrid = gHippoGridManager->getCurrentGridName();
loadCurGrid(); loadCurGrid();
} }

6
indra/newview/llpanellogin.cpp
View File

@@ -810,14 +810,14 @@ void LLPanelLogin::updateGridCombo()
std::string grid = it->second->getGridName(); std::string grid = it->second->getGridName();
if(grid.empty() || it->second == defGrid || it->second == curGrid) if(grid.empty() || it->second == defGrid || it->second == curGrid)
continue; continue;
grids->add(grid,it->second->getGridNick()); grids->add(grid);
} }
if(curGrid || defGrid) if(curGrid || defGrid)
{ {
if(defGrid) if(defGrid)
grids->add(defGrid->getGridName(),defGrid->getGridNick(),ADD_TOP); grids->add(defGrid->getGridName(),ADD_TOP);
if(curGrid && defGrid != curGrid) if(curGrid && defGrid != curGrid)
grids->add(curGrid->getGridName(),curGrid->getGridNick(),ADD_TOP); grids->add(curGrid->getGridName(),ADD_TOP);
grids->setCurrentByIndex(0); grids->setCurrentByIndex(0);
} }
else else

9
indra/newview/llpanelnearbymedia.cpp
View File

@@ -478,7 +478,7 @@ void LLPanelNearByMedia::updateListItem(LLScrollListItem* item,
// *TODO: Make these font styles/colors configurable via XUI // *TODO: Make these font styles/colors configurable via XUI
U8 font_style = LLFontGL::NORMAL; U8 font_style = LLFontGL::NORMAL;
LLColor4 cell_color = LLColor4::black; LLColor4 cell_color = LLUI::sColorsGroup->getColor("DefaultListText");
// Only colorize by class in debug // Only colorize by class in debug
if (mDebugInfoVisible) if (mDebugInfoVisible)
@@ -503,7 +503,7 @@ void LLPanelNearByMedia::updateListItem(LLScrollListItem* item,
if (mDebugInfoVisible) if (mDebugInfoVisible)
{ {
font_style |= LLFontGL::ITALIC; font_style |= LLFontGL::ITALIC;
cell_color = LLColor4::black; cell_color = LLUI::sColorsGroup->getColor("DefaultListText");
} }
else { else {
// Dim it if it is disabled // Dim it if it is disabled
@@ -973,7 +973,7 @@ void LLPanelNearByMedia::onAdvancedButtonClick()
LLTabContainer* tabcontainer = prefsfloater->getChild<LLTabContainer>("pref core"); LLTabContainer* tabcontainer = prefsfloater->getChild<LLTabContainer>("pref core");
if (tabcontainer) if (tabcontainer)
{ {
tabcontainer->selectTabByName("Media Panel"); tabcontainer->selectTabByName("Media panel");
} }
} }
} }
@@ -984,7 +984,8 @@ void LLPanelNearByMedia::onMoreLess()
mNearbyMediaPanel->setVisible(is_more); mNearbyMediaPanel->setVisible(is_more);
// enable resizing when expanded // 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; LLRect new_rect = is_more ? mMoreRect : mLessRect;
new_rect.translate(getRect().mRight - new_rect.mRight, getRect().mTop - new_rect.mTop); new_rect.translate(getRect().mRight - new_rect.mRight, getRect().mTop - new_rect.mTop);

2
indra/newview/llviewerobject.h
View File

@@ -325,7 +325,7 @@ public:
/*virtual*/ S32 setTEGlow(const U8 te, const F32 glow); /*virtual*/ S32 setTEGlow(const U8 te, const F32 glow);
/*virtual*/ BOOL setMaterial(const U8 material); /*virtual*/ BOOL setMaterial(const U8 material);
virtual void setTEImage(const U8 te, LLViewerTexture *imagep); // Not derived from LLPrimitive 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; LLViewerTexture *getTEImage(const U8 te) const;
void fitFaceTexture(const U8 face); void fitFaceTexture(const U8 face);

BIN
indra/newview/skins/default/textures/Parcel_Exp_Color.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 272 B

4
indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel follows="left|right|bottom|top" height="200" left="-1" mouse_opaque="false" <panel follows="left|right|bottom|top" height="200" left="-1" mouse_opaque="false"
name="overlay" use_bounding_rect="true" width="728"> user_resize="false" name="overlay" use_bounding_rect="true" width="728">
<layout_stack bottom="0" follows="left|right|bottom" height="200" left="0" <layout_stack bottom="0" follows="left|right|bottom" height="200" left="0"
mouse_opaque="false" name="overlay_layout_panel" orientation="horizontal" mouse_opaque="false" name="overlay_layout_panel" orientation="horizontal"
right="-1" use_bounding_rect="true"> right="-1" use_bounding_rect="true">
@@ -44,7 +44,7 @@
</layout_panel> </layout_panel>
<layout_panel auto_resize="false" background_visible="false" border="false" bottom="0" <layout_panel auto_resize="false" background_visible="false" border="false" bottom="0"
filename="panel_chat_bar.xml" follows="left|right|bottom" left="0" filename="panel_chat_bar.xml" follows="left|right|bottom" left="0"
min_height="24" mouse_opaque="false" name="chat_bar" min_height="24" mouse_opaque="false" name="chat_bar" user_resize="false"
use_bounding_rect="true" width="395" /> use_bounding_rect="true" width="395" />
</layout_stack> </layout_stack>
</layout_panel> </layout_panel>

18
indra/newview/skins/default/xui/es/panel_nearby_media.xml
View File

@@ -30,17 +30,17 @@
Mostrar: Mostrar:
</text> </text>
<combo_box name="show_combo"> <combo_box name="show_combo">
<combo_box.item label="Todo" name="All"/> <combo_item name="All">Todo</combo_box>
<combo_box.item label="En esta parcela" name="WithinParcel"/> <combo_item name="WithinParcel>En esta parcela</combo_box>
<combo_box.item label="Fuera de la parcela" name="OutsideParcel"/> <combo_item name="OutsideParcel">Fuera de la parcela</combo_box>
<combo_box.item label="En otros avatares" name="OnOthers"/> <combo_item name="OnOthers">En otros avatares</combo_box>
</combo_box> </combo_box>
<scroll_list name="media_list"> <scroll_list name="media_list">
<scroll_list.columns label="Cercanía" name="media_proximity"/> <column label="Cercanía" name="media_proximity"/>
<scroll_list.columns label="Visibilidad" name="media_visibility"/> <column label="Visibilidad" name="media_visibility"/>
<scroll_list.columns label="Clase" name="media_class"/> <column label="Clase" name="media_class"/>
<scroll_list.columns label="Nombre" name="media_name"/> <column label="Nombre" name="media_name"/>
<scroll_list.columns label="Depurar" name="media_debug"/> <column label="Depurar" name="media_debug"/>
</scroll_list> </scroll_list>
<panel name="media_controls_panel"> <panel name="media_controls_panel">
<layout_stack name="media_controls"> <layout_stack name="media_controls">

18
indra/newview/skins/default/xui/fr/panel_nearby_media.xml
View File

@@ -30,17 +30,17 @@
Voir : Voir :
</text> </text>
<combo_box name="show_combo"> <combo_box name="show_combo">
<combo_box.item label="Tout" name="All"/> <combo_item name="All">Tout</combo_item>
<combo_box.item label="Sur cette parcelle" name="WithinParcel"/> <combo_item name="WithinParcel">Sur cette parcelle</combo_item>
<combo_box.item label="En dehors de la parcelle" name="OutsideParcel"/> <combo_item name="OutsideParcel">En dehors de la parcelle</combo_item>
<combo_box.item label="Sur les autres avatars" name="OnOthers"/> <combo_item name="OnOthers">Sur les autres avatars</combo_item>
</combo_box> </combo_box>
<scroll_list name="media_list"> <scroll_list name="media_list">
<scroll_list.columns label="Proximité" name="media_proximity"/> <column label="Proximité" name="media_proximity"/>
<scroll_list.columns label="Visible" name="media_visibility"/> <column label="Visible" name="media_visibility"/>
<scroll_list.columns label="Classe" name="media_class"/> <column label="Classe" name="media_class"/>
<scroll_list.columns label="Nom" name="media_name"/> <column label="Nom" name="media_name"/>
<scroll_list.columns label="Débogage" name="media_debug"/> <column label="Débogage" name="media_debug"/>
</scroll_list> </scroll_list>
<panel name="media_controls_panel"> <panel name="media_controls_panel">
<layout_stack name="media_controls"> <layout_stack name="media_controls">

18
indra/newview/skins/default/xui/pt/panel_nearby_media.xml
View File

@@ -30,17 +30,17 @@
Mostrar: Mostrar:
</text> </text>
<combo_box name="show_combo"> <combo_box name="show_combo">
<combo_box.item label="Tudo" name="All"/> <combo_item name="All">Tudo</combo_item>
<combo_box.item label="Neste lote" name="WithinParcel"/> <combo_item name="WithinParcel">Neste lote</combo_item>
<combo_box.item label="Fora deste lote" name="OutsideParcel"/> <combo_item name="OutsideParcel">Fora deste lote</combo_item>
<combo_box.item label="Nos outros avatares" name="OnOthers"/> <combo_item name="OnOthers">Nos outros avatares</combo_item>
</combo_box> </combo_box>
<scroll_list name="media_list"> <scroll_list name="media_list">
<scroll_list.columns label="Proximidade" name="media_proximity"/> <column label="Proximidade" name="media_proximity"/>
<scroll_list.columns label="Visíveis" name="media_visibility"/> <column label="Visíveis" name="media_visibility"/>
<scroll_list.columns label="Classe" name="media_class"/> <column label="Classe" name="media_class"/>
<scroll_list.columns label="Nome" name="media_name"/> <column label="Nome" name="media_name"/>
<scroll_list.columns label="Depurar" name="media_debug"/> <column label="Depurar" name="media_debug"/>
</scroll_list> </scroll_list>
<panel name="media_controls_panel"> <panel name="media_controls_panel">
<layout_stack name="media_controls"> <layout_stack name="media_controls">