diff options
-rw-r--r-- | ChangeLog.txt | 6 | ||||
-rw-r--r-- | linden/indra/newview/llfloatercustomize.cpp | 22 | ||||
-rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml | 6 |
3 files changed, 34 insertions, 0 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index d264ec4..c397bc6 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -1,5 +1,11 @@ | |||
1 | 2009-10-12 McCabe Maxsted <hakushakukun@gmail.com> | 1 | 2009-10-12 McCabe Maxsted <hakushakukun@gmail.com> |
2 | 2 | ||
3 | * Added check/uncheck all buttons for make outfit from Meerkat viewer. | ||
4 | |||
5 | modified: linden/indra/newview/llfloatercustomize.cpp | ||
6 | modified: linden/indra/newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml | ||
7 | |||
8 | |||
3 | * Removed reference to 'Second Life' from postcard message a la Meerkat. | 9 | * Removed reference to 'Second Life' from postcard message a la Meerkat. |
4 | 10 | ||
5 | modified: linden/indra/newview/skins/default/xui/en-us/floater_postcard.xml | 11 | modified: linden/indra/newview/skins/default/xui/en-us/floater_postcard.xml |
diff --git a/linden/indra/newview/llfloatercustomize.cpp b/linden/indra/newview/llfloatercustomize.cpp index 7d88a0f..432af73 100644 --- a/linden/indra/newview/llfloatercustomize.cpp +++ b/linden/indra/newview/llfloatercustomize.cpp | |||
@@ -245,6 +245,8 @@ public: | |||
245 | 245 | ||
246 | childSetAction("Save", onSave, this ); | 246 | childSetAction("Save", onSave, this ); |
247 | childSetAction("Cancel", onCancel, this ); | 247 | childSetAction("Cancel", onCancel, this ); |
248 | childSetAction("Check All", onCheckAll, this ); | ||
249 | childSetAction("Uncheck All", onUncheckAll, this ); | ||
248 | } | 250 | } |
249 | 251 | ||
250 | BOOL getRenameClothing() | 252 | BOOL getRenameClothing() |
@@ -325,6 +327,26 @@ public: | |||
325 | LLMakeOutfitDialog* self = (LLMakeOutfitDialog*) userdata; | 327 | LLMakeOutfitDialog* self = (LLMakeOutfitDialog*) userdata; |
326 | self->close(); // destroys this object | 328 | self->close(); // destroys this object |
327 | } | 329 | } |
330 | |||
331 | static void onCheckAll( void* userdata ) | ||
332 | { | ||
333 | LLMakeOutfitDialog* self = (LLMakeOutfitDialog*) userdata; | ||
334 | for( S32 i = 0; i < (S32)(self->mCheckBoxList.size()); i++) | ||
335 | { | ||
336 | std::string name = self->mCheckBoxList[i].first; | ||
337 | if(self->childIsEnabled(name))self->childSetValue(name,TRUE); | ||
338 | } | ||
339 | } | ||
340 | |||
341 | static void onUncheckAll( void* userdata ) | ||
342 | { | ||
343 | LLMakeOutfitDialog* self = (LLMakeOutfitDialog*) userdata; | ||
344 | for( S32 i = 0; i < (S32)(self->mCheckBoxList.size()); i++) | ||
345 | { | ||
346 | std::string name = self->mCheckBoxList[i].first; | ||
347 | if(self->childIsEnabled(name))self->childSetValue(name,FALSE); | ||
348 | } | ||
349 | } | ||
328 | }; | 350 | }; |
329 | 351 | ||
330 | ///////////////////////////////////////////////////////////////////// | 352 | ///////////////////////////////////////////////////////////////////// |
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml b/linden/indra/newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml index 568f155..27a08c1 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml | |||
@@ -225,6 +225,12 @@ now wearing into it. | |||
225 | width="489"> | 225 | width="489"> |
226 | Items to include in outfit: | 226 | Items to include in outfit: |
227 | </text> | 227 | </text> |
228 | <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20" | ||
229 | label="Check All" left_delta="200" mouse_opaque="true" | ||
230 | name="Check All" scale_image="true" width="90" /> | ||
231 | <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20" | ||
232 | label="Uncheck All" left_delta="100" mouse_opaque="true" | ||
233 | name="Uncheck All" scale_image="true" width="90" /> | ||
228 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 234 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
229 | bottom="-196" drop_shadow_visible="true" enabled="true" follows="left|top" | 235 | bottom="-196" drop_shadow_visible="true" enabled="true" follows="left|top" |
230 | font="SansSerifSmall" h_pad="0" halign="left" height="14" left="13" | 236 | font="SansSerifSmall" h_pad="0" halign="left" height="14" left="13" |