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

Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer

Browse Source
This commit is contained in:
Lirusaito
2013-07-01 21:13:11 -04:00
parent 1de076c9c0 0e159e47cd
commit e199d5f867
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/skins/default/xui/en-us/floater_web_content.xml
View File

@@ -141,6 +141,7 @@
<layout_panel name="status_bar" <layout_panel name="status_bar"
height="23" height="23"
mouse_opaque="false" mouse_opaque="false"
user_resize="false"
auto_resize="false"> auto_resize="false">
<text <text
type="string" type="string"

6
indra/newview/skins/default/xui/en-us/panel_progress.xml
View File

@@ -3,16 +3,16 @@
<layout_stack name="stack1" orientation="horizontal" left="0" bottom="0" width="1024" height="768" follows="left|right|top|bottom"> <layout_stack name="stack1" orientation="horizontal" left="0" bottom="0" width="1024" height="768" follows="left|right|top|bottom">
<layout_panel name="panel1" user_resize="false" min_width="10" width="150"/> <layout_panel name="panel1" user_resize="false" min_width="10" width="150"/>
<layout_panel name="panel2" user_resize="false" min_width="640" width="724" height="768"> <layout_panel name="panel2" user_resize="false" min_width="640" width="724" height="768">
<layout_stack name="stack2" orientation="vertical" left="0" bottom="0" height="768" width="640" follows="left|right|top|bottom"> <layout_stack name="stack2" orientation="vertical" left="0" bottom="0" height="768" width="724" follows="left|right|top|bottom">
<layout_panel name="panel3" min_height="10" height="200" width="724"/> <layout_panel name="panel3" min_height="10" height="200" width="724"/>
<layout_panel name="panel4" min_height="250" height="250" width="724" auto_resize="false"> <layout_panel name="panel4" min_height="250" height="250" width="724" auto_resize="false">
<icon image_name="rounded_square.tga" color="LoginProgressBoxCenterColor" left="0" bottom="0" width="724" height="250" follows="left|right|bottom|top"/> <icon image_name="rounded_square.tga" color="LoginProgressBoxCenterColor" left="0" bottom="0" width="724" height="250" follows="left|right|bottom|top"/>
<text name="title_text" halign="center" font="SansSerif" left="0" bottom="-70" width="724" height="20" text_color="LoginProgressBoxTextColor" font-shadow="hard" follows="left|right|top"/> <text name="title_text" halign="center" font="SansSerif" left="0" bottom="-70" width="724" height="20" text_color="LoginProgressBoxTextColor" font-shadow="hard" follows="left|right|top"/>
<text name="progress_text" halign="center" font="SansSerif" left="0" bottom="-95" width="724" height="20" text_color="LoginProgressBoxTextColor" font-shadow="hard" follows="left|right|top"/> <text name="progress_text" halign="center" font="SansSerif" left="0" bottom="-95" width="724" height="20" text_color="LoginProgressBoxTextColor" font-shadow="hard" follows="left|right|top"/>
<progress_bar name="login_progress_bar" color="255,255,255,245" height="16" bottom="135" left="45" right="-45" follows="left|right|top" /> <progress_bar name="login_progress_bar" color="255,255,255,245" height="16" bottom="135" left="45" right="-45" follows="left|right|top" />
<text name="message_text" halign="center" line_spacing="8" font="SansSerif" left="20" bottom="5" width="700" height="100" text_color="LoginProgressBoxTextColor" font-shadow="hard" follows="left|right|top|bottom"/> <text name="message_text" halign="center" line_spacing="8" font="SansSerif" left="20" right="-20" bottom="5" height="100" text_color="LoginProgressBoxTextColor" font-shadow="hard" follows="left|right|top|bottom"/>
</layout_panel> </layout_panel>
<layout_panel name="panel5" min_width="10" height="200" width="640"/> <layout_panel name="panel5" min_width="10" height="200" width="724"/>
</layout_stack> </layout_stack>
</layout_panel> </layout_panel>
<layout_panel name="panel6" user_resize="false" min_width="10" width="150"/> <layout_panel name="panel6" user_resize="false" min_width="10" width="150"/>

7
indra/newview/wlfPanel_AdvSettings.cpp
View File

@@ -72,6 +72,7 @@ void wlfPanel_AdvSettings::updateClass()
void wlfPanel_AdvSettings::build() void wlfPanel_AdvSettings::build()
{ {
mConnections.clear();
deleteAllChildren(); deleteAllChildren();
std::string ButtonState; std::string ButtonState;
if (gSavedSettings.getBOOL("wlfAdvSettingsPopup")) if (gSavedSettings.getBOOL("wlfAdvSettingsPopup"))
@@ -161,9 +162,9 @@ BOOL wlfPanel_AdvSettings::postBuild()
// mDayCyclePresetCombo = getChild<LLComboBox>("DCPresetsCombo"); // mDayCyclePresetCombo = getChild<LLComboBox>("DCPresetsCombo");
// mDayCyclePresetCombo->setCommitCallback(boost::bind(&wlfPanel_AdvSettings::onChangeDCPresetName, this, _2)); // mDayCyclePresetCombo->setCommitCallback(boost::bind(&wlfPanel_AdvSettings::onChangeDCPresetName, this, _2));
LLEnvManagerNew::instance().setPreferencesChangeCallback(boost::bind(&wlfPanel_AdvSettings::refreshLists, this)); mConnections.push_front(new boost::signals2::scoped_connection(LLEnvManagerNew::instance().setPreferencesChangeCallback(boost::bind(&wlfPanel_AdvSettings::refreshLists, this))));
LLWaterParamManager::getInstance()->setPresetListChangeCallback(boost::bind(&wlfPanel_AdvSettings::populateWaterPresetsList, this)); mConnections.push_front(new boost::signals2::scoped_connection(LLWaterParamManager::getInstance()->setPresetListChangeCallback(boost::bind(&wlfPanel_AdvSettings::populateWaterPresetsList, this))));
LLWLParamManager::getInstance()->setPresetListChangeCallback(boost::bind(&wlfPanel_AdvSettings::populateSkyPresetsList, this)); mConnections.push_front(new boost::signals2::scoped_connection(LLWLParamManager::getInstance()->setPresetListChangeCallback(boost::bind(&wlfPanel_AdvSettings::populateSkyPresetsList, this))));
// LLDayCycleManager::instance().setModifyCallback(boost::bind(&wlfPanel_AdvSettings::populateDayCyclePresetsList, this)); // LLDayCycleManager::instance().setModifyCallback(boost::bind(&wlfPanel_AdvSettings::populateDayCyclePresetsList, this));
populateWaterPresetsList(); populateWaterPresetsList();

4
indra/newview/wlfPanel_AdvSettings.h
View File

@@ -33,7 +33,7 @@
#define LL_wlfPanel_AdvSettings_H #define LL_wlfPanel_AdvSettings_H
#include "llpanel.h" #include "llpanel.h"
#include <boost/ptr_container/ptr_list.hpp>
// [RLVa:KB] // [RLVa:KB]
#include "rlvhandler.h" #include "rlvhandler.h"
@@ -83,6 +83,8 @@ protected:
LLSliderCtrl* mTimeSlider; LLSliderCtrl* mTimeSlider;
bool mExpanded; bool mExpanded;
boost::ptr_list<boost::signals2::scoped_connection> mConnections;
}; };
#endif // LL_wlfPanel_AdvSettings_H #endif // LL_wlfPanel_AdvSettings_H