From c5356935354013530432cfb07556902a039020a9 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Mon, 12 Jul 2010 17:32:03 -0400 Subject: EXT-8333 FIXED 'Add more': 'Wear' item remains enabled in context menu of worn object Simple logic fix so that worn objects son't have add/wear option. --- indra/newview/llwearableitemslist.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra') diff --git a/indra/newview/llwearableitemslist.cpp b/indra/newview/llwearableitemslist.cpp index 60ebb9416e..35abbc0c4d 100644 --- a/indra/newview/llwearableitemslist.cpp +++ b/indra/newview/llwearableitemslist.cpp @@ -765,8 +765,8 @@ void LLWearableItemsList::ContextMenu::updateItemsVisibility(LLContextMenu* menu bool standalone = mParent ? mParent->isStandalone() : false; // *TODO: eliminate multiple traversals over the menu items - setMenuItemVisible(menu, "wear_wear", n_already_worn == 0); - setMenuItemEnabled(menu, "wear_wear", n_already_worn == 0); + setMenuItemVisible(menu, "wear_wear", n_already_worn == 0 && n_worn == 0); + setMenuItemEnabled(menu, "wear_wear", n_already_worn == 0 && n_worn == 0); setMenuItemVisible(menu, "wear_add", mask == MASK_CLOTHING && n_worn == 0 && n_already_worn != 0); setMenuItemEnabled(menu, "wear_add", n_items == 1 && canAddWearable(ids.front()) && n_already_worn != 0); setMenuItemVisible(menu, "wear_replace", n_worn == 0 && n_already_worn != 0); -- cgit v1.2.3 From 4339600d43601f07d01c676cce5da17c2758c4cb Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Wed, 14 Jul 2010 10:16:18 +0100 Subject: fix some wacky casting. --- indra/newview/llviewerstats.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/llviewerstats.h b/indra/newview/llviewerstats.h index b5cea9d6a8..694eeaf097 100644 --- a/indra/newview/llviewerstats.h +++ b/indra/newview/llviewerstats.h @@ -235,7 +235,8 @@ public: inline void reset() { - mCount = mSum = mSumOfSquares = 0; + mCount = 0; + mSum = mSumOfSquares = 0.f; mCountOfNextUpdatesToIgnore = 0; } -- cgit v1.2.3 From 2acfe2547a45cb15420c5dad18d4e4e2e83f05a5 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Wed, 14 Jul 2010 17:36:13 +0100 Subject: EXT-7455 PARTIAL viewer crash in LLSurface::getWaterHeight Somewhere between a band-aid and a real fix. Entirely speculative since there is no repro. --- indra/newview/llsurface.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra') diff --git a/indra/newview/llsurface.cpp b/indra/newview/llsurface.cpp index ddb5d08e07..cecc135951 100644 --- a/indra/newview/llsurface.cpp +++ b/indra/newview/llsurface.cpp @@ -158,6 +158,7 @@ void LLSurface::initClasses() void LLSurface::setRegion(LLViewerRegion *regionp) { mRegionp = regionp; + mWaterObjp = NULL; // depends on regionp, needs recreating } // Assumes that arguments are powers of 2, and that @@ -958,6 +959,7 @@ LLSurfacePatch *LLSurface::resolvePatchRegion(const LLVector3 &pos_region) const LLSurfacePatch *LLSurface::resolvePatchGlobal(const LLVector3d &pos_global) const { + llassert(mRegionp); LLVector3 pos_region = mRegionp->getPosRegionFromGlobal(pos_global); return resolvePatchRegion(pos_region); } -- cgit v1.2.3 From 354c576a01176505fa7fba778d5d51474ef01370 Mon Sep 17 00:00:00 2001 From: Eli Linden Date: Wed, 14 Jul 2010 11:12:33 -0700 Subject: ND-47671 WIP FR linguistic --- .../skins/default/xui/fr/floater_inventory_item_properties.xml | 4 ++-- indra/newview/skins/default/xui/fr/menu_attachment_self.xml | 2 +- indra/newview/skins/default/xui/fr/menu_inspect_object_gear.xml | 2 +- indra/newview/skins/default/xui/fr/menu_inventory.xml | 2 +- indra/newview/skins/default/xui/fr/menu_object.xml | 2 +- indra/newview/skins/default/xui/fr/menu_place.xml | 2 +- indra/newview/skins/default/xui/fr/menu_viewer.xml | 8 ++++---- indra/newview/skins/default/xui/fr/panel_edit_wearable.xml | 2 +- indra/newview/skins/default/xui/fr/panel_login.xml | 2 +- indra/newview/skins/default/xui/fr/panel_places.xml | 2 +- indra/newview/skins/default/xui/fr/role_actions.xml | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) (limited to 'indra') diff --git a/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml index fca1a329a2..29b61fc98d 100644 --- a/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml +++ b/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml @@ -44,7 +44,7 @@ Vous : - + @@ -58,7 +58,7 @@ Le prochain propriétaire : - + diff --git a/indra/newview/skins/default/xui/fr/menu_attachment_self.xml b/indra/newview/skins/default/xui/fr/menu_attachment_self.xml index 3f6cd85685..4516b624b8 100644 --- a/indra/newview/skins/default/xui/fr/menu_attachment_self.xml +++ b/indra/newview/skins/default/xui/fr/menu_attachment_self.xml @@ -1,7 +1,7 @@ - + diff --git a/indra/newview/skins/default/xui/fr/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/fr/menu_inspect_object_gear.xml index 0ecce069bd..e2b215cbb8 100644 --- a/indra/newview/skins/default/xui/fr/menu_inspect_object_gear.xml +++ b/indra/newview/skins/default/xui/fr/menu_inspect_object_gear.xml @@ -7,7 +7,7 @@ - + diff --git a/indra/newview/skins/default/xui/fr/menu_inventory.xml b/indra/newview/skins/default/xui/fr/menu_inventory.xml index 0e12ff68c6..39aa22f5cd 100644 --- a/indra/newview/skins/default/xui/fr/menu_inventory.xml +++ b/indra/newview/skins/default/xui/fr/menu_inventory.xml @@ -79,7 +79,7 @@ - + diff --git a/indra/newview/skins/default/xui/fr/menu_object.xml b/indra/newview/skins/default/xui/fr/menu_object.xml index 6492a83e06..576fc66d46 100644 --- a/indra/newview/skins/default/xui/fr/menu_object.xml +++ b/indra/newview/skins/default/xui/fr/menu_object.xml @@ -1,7 +1,7 @@ - + diff --git a/indra/newview/skins/default/xui/fr/menu_place.xml b/indra/newview/skins/default/xui/fr/menu_place.xml index 441b476ad2..6b0f4db752 100644 --- a/indra/newview/skins/default/xui/fr/menu_place.xml +++ b/indra/newview/skins/default/xui/fr/menu_place.xml @@ -3,5 +3,5 @@ - + diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml index ec9bee9a64..cd0e41e496 100644 --- a/indra/newview/skins/default/xui/fr/menu_viewer.xml +++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml @@ -61,8 +61,8 @@ - - + + @@ -187,8 +187,8 @@ - - + + diff --git a/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml b/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml index 4b1572b052..624026efbb 100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml @@ -103,6 +103,6 @@