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

Merge shyotl, setting include broken (disabled)

Browse Source
This commit is contained in:
Siana Gearz
2010-11-09 15:14:34 +01:00
parent 8d6ce154fd f357842265
commit 17a0d13b0c
61 changed files with 3320 additions and 2231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llfloatersettingsdebug.cpp
View File

@@ -105,7 +105,7 @@ void LLFloaterSettingsDebug::draw()
{
LLComboBox* settings_combo = getChild<LLComboBox>("settings_combo");
LLControlVariable* controlp = (LLControlVariable*)settings_combo->getCurrentUserdata();
updateControl(controlp);
updateControl(controlp ? controlp->getCOAActive() : NULL);
LLFloater::draw();
}
@@ -130,7 +130,7 @@ void LLFloaterSettingsDebug::onSettingSelect(LLUICtrl* ctrl, void* user_data)
LLComboBox* combo_box = (LLComboBox*)ctrl;
LLControlVariable* controlp = (LLControlVariable*)combo_box->getCurrentUserdata();
floaterp->updateControl(controlp);
floaterp->updateControl(controlp ? controlp->getCOAActive() : NULL);
}
//static
@@ -140,6 +140,7 @@ void LLFloaterSettingsDebug::onCommitSettings(LLUICtrl* ctrl, void* user_data)
LLComboBox* settings_combo = floaterp->getChild<LLComboBox>("settings_combo");
LLControlVariable* controlp = (LLControlVariable*)settings_combo->getCurrentUserdata();
controlp = controlp ? controlp->getCOAActive() : NULL;
LLVector3 vector;
LLVector3d vectord;
@@ -217,6 +218,7 @@ void LLFloaterSettingsDebug::onClickDefault(void* user_data)
if (controlp)
{
controlp = controlp->getCOAActive();
controlp->resetToDefault();
floaterp->updateControl(controlp);
}
@@ -274,6 +276,7 @@ void LLFloaterSettingsDebug::updateControl(LLControlVariable* controlp)
}
// [/RLVa:KB]
controlp = controlp->getCOAActive();
eControlType type = controlp->type();
//hide combo box only for non booleans, otherwise this will result in the combo box closing every frame