diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloaterdebugmaterials.cpp | 9 | ||||
| -rw-r--r-- | indra/newview/llfloaterdebugmaterials.h | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_debug_materials.xml | 10 |
3 files changed, 19 insertions, 1 deletions
diff --git a/indra/newview/llfloaterdebugmaterials.cpp b/indra/newview/llfloaterdebugmaterials.cpp index f6af2b68fa..8e37736394 100644 --- a/indra/newview/llfloaterdebugmaterials.cpp +++ b/indra/newview/llfloaterdebugmaterials.cpp @@ -217,6 +217,10 @@ BOOL LLFloaterDebugMaterials::postBuild() llassert(mPutClearButton != NULL); mPutClearButton->setCommitCallback(boost::bind(&LLFloaterDebugMaterials::onPutClearClicked, this)); + LLButton* resetPutValuesButton = findChild<LLButton>("reset_put_values_button"); + llassert(resetPutValuesButton != NULL); + resetPutValuesButton->setCommitCallback(boost::bind(&LLFloaterDebugMaterials::onResetPutValuesClicked, this)); + mPutScrollList = findChild<LLScrollListCtrl>("put_scroll_list"); llassert(mPutScrollList != NULL); @@ -387,6 +391,11 @@ void LLFloaterDebugMaterials::onPutClearClicked() requestPutMaterials(false); } +void LLFloaterDebugMaterials::onResetPutValuesClicked() +{ + resetObjectEditInputs(); +} + void LLFloaterDebugMaterials::onQueryVisibleObjectsClicked() { queryViewableObjects(); diff --git a/indra/newview/llfloaterdebugmaterials.h b/indra/newview/llfloaterdebugmaterials.h index 204392d5e3..732b6a9349 100644 --- a/indra/newview/llfloaterdebugmaterials.h +++ b/indra/newview/llfloaterdebugmaterials.h @@ -75,6 +75,7 @@ private: void onValueEntered(LLUICtrl* pUICtrl); void onPutSetClicked(); void onPutClearClicked(); + void onResetPutValuesClicked(); void onQueryVisibleObjectsClicked(); void onGoodPostClicked(); void onBadPostClicked(); diff --git a/indra/newview/skins/default/xui/en/floater_debug_materials.xml b/indra/newview/skins/default/xui/en/floater_debug_materials.xml index 85743e4501..e2e197a14e 100644 --- a/indra/newview/skins/default/xui/en/floater_debug_materials.xml +++ b/indra/newview/skins/default/xui/en/floater_debug_materials.xml @@ -716,7 +716,7 @@ height="22" left="0" top_pad="110" - width="450"> + width="810"> <button follows="left|top" height="22" @@ -734,6 +734,14 @@ name="put_clear_button" left_pad="20" width="214"/> + <button + follows="left|top" + height="22" + label="Reset Input Values" + layout="topleft" + name="reset_put_values_button" + left_pad="146" + width="214"/> </panel> </panel> <view_border |