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

Merge branch 'V2Renderer' into V2TextureSystem

Browse Source 
Conflicts:
	indra/newview/llviewercontrol.cpp
This commit is contained in:
Shyotl
2011-04-23 19:33:20 -05:00
parent 7b1736ea9d f7a5394904
commit ac12349a8a
22 changed files with 238 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llui/llcombobox.cpp
View File

@@ -248,6 +248,8 @@ void LLComboBox::onCommit()
mTextEntry->setValue(getSimple());
mTextEntry->setTentative(FALSE);
}
setControlValue(getValue());
LLUICtrl::onCommit();
}