Commit Graph

11070 Commits (adfa188ceea432edf889d50e2c86bbc9ead9c71d)

Author SHA1 Message Date
Nyx (Neal Orman) adfa188cee Automated merge with ssh://hg.lindenlab.com/q/viewer-release/ 2010-07-08 17:53:48 -04:00
Nyx (Neal Orman) 6f2118432d EXT-8279 FIX original items being deleted when removed from COF
Replacing logic with call to removeCOFItemLinks, which should do appropriate
checking to determine that item is in the COF and is actually a link.

Code reviewed by Seraph
2010-07-08 17:53:32 -04:00
Leyla Farazha aea47535b4 Merge 2010-07-08 14:52:56 -07:00
Leyla Farazha 58ab4dfd88 EXT-8140 Changing items in "add more" view, or editing the items, causes avatar to bounce up and down 2010-07-08 14:51:27 -07:00
Monroe Linden bfb66a8b94 Fix for EXT-8151
Made LLPanelOutfitEdit::onPlusBtnClicked() iterate over all selected items and wear each one.  Also made it create one LLUpdateAppearanceOnDestroy and pass it to all calls to wearItemOnAvatar.

Add optional callback argument (as LLPointer) to wearItemOnAvatar, addCOFItemLink, LLDeferredCOFLinkObserver

Reviewed by Nyx at http://codereview.lindenlab.com/2482033
2010-07-08 14:13:26 -07:00
Dave Parks 19bb6f489a merge 2010-07-08 15:15:32 -05:00
Dave Parks 3d94133776 EXT-8287 Add some null checks and asserts around drawable faces. 2010-07-08 15:14:23 -05:00
Dave Parks b056f6d7f7 EXT-8236 Massage code around crash in ~LLSpatialGroup -- looks like heap corruption. 2010-07-08 12:56:22 -05:00
Brad Payne (Vir Linden) c80da2248d merge 2010-07-08 10:57:15 -04:00
Brad Payne (Vir Linden) 7380d8f1cb EXT-8238 FIX - unfortunately this won't have much impact on crash rates, since the problem occurs when we're already shutting down 2010-07-08 10:53:39 -04:00
Tofu Linden ca5e05a5c7 merge from PE's viewer-public 2010-07-08 10:14:00 +01:00
Alexei Arabadji 27b3005b78 EXT-8218 FIXED Fixed crash in LLNotificationsUI::LLScreenChannel::redrawToasts method.
Details:
Provided resetting hovered toast field in screen channel when toast destroyed along viewer logging out.

reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/705/

--HG--
branch : product-engine
2010-07-08 10:48:17 +03:00
Xiaohong Bao b9248bddec Automated merge with ssh://hg.lindenlab.com/q/viewer-release 2010-07-07 23:17:56 -06:00
Xiaohong Bao 4e499fe916 EXT-8278: FIXED: endlessly loading some tree textures. 2010-07-07 23:13:46 -06:00
Xiaohong Bao fd0347a8a2 adjust debug code for EXT-6792: [crashhunters] Crash on ATI 3200 2010-07-07 16:18:05 -06:00
Dave Parks fa678e8445 merge 2010-07-07 16:41:45 -05:00
Dave Parks 23730070aa EXT-8102 Modify feature table to default RenderUseStreamVBO to off for ATI cards. 2010-07-07 16:41:04 -05:00
Brad Payne (Vir Linden) f3a8087de6 merge 2010-07-07 17:23:26 -04:00
Nyx (Neal Orman) 908c1222de Automated merge with ssh://hg.lindenlab.com/q/viewer-release/ 2010-07-07 17:03:49 -04:00
Nyx (Neal Orman) e50692ef4b SNOW-704 EXT-8267 FIX Crash on login for invalid inventory wearable type data
Used to assert that the inventory's stored wearable type data matched the
asset's stored wearable type, leading to a crash when these did not line up.
Converted the assert to a check with llwarns for when this happens.

code reviewed by vir
2010-07-07 17:03:43 -04:00
Brad Payne (Vir Linden) aae0b2aea8 merge 2010-07-07 17:02:37 -04:00
Brad Payne (Vir Linden) 3ca975740f EXT-8234 FIX - reduced log spam quite a bit; rest is arguably still useful for diagnosing the not-uncommon problems encountered during outfit changes 2010-07-07 16:13:20 -04:00
Brad Payne (Vir Linden) ef932f5cf4 EXT-8003 FIX, EXT-8048 FIX 2010-07-07 15:05:06 -04:00
Vadim Savchuk e595ea43be EXT-8170 FIXED Fixed clothing context menu localization in Edit Outfit.
- Localized the "New Shoes" string.
  I'm sceptical about this fix. Let's see if the translation team accepts it.
  If not, I'll add a bunch of new translatable strings like "Create new shoes", "Create new pants", etc.
- Translated the "Replace" item of clothing context menu (took translation from the body part context menu).

Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/710/

--HG--
branch : product-engine
2010-07-07 21:27:04 +03:00
Xiaohong Bao 11621e8882 Automated merge with ssh://hg.lindenlab.com/q/viewer-release 2010-07-07 12:19:54 -06:00
Xiaohong Bao c0761b99b7 EXT-8002: FIXED: Crossing a sim boundary in a vehicle results in unexpected catapulting 2010-07-07 12:19:24 -06:00
Vadim Savchuk 07406b8397 EXT-8208 FIXED Hide pop-ups on entering mouse-look mode.
Reviewed by Sergey Litovchuk at https://codereview.productengine.com/secondlife/r/706/

--HG--
branch : product-engine
2010-07-07 21:18:32 +03:00
Vadim Savchuk 4132632cbe EXT-8254 FIXED Enabled texture/color selection when editing non-copyable clothing items.
Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/707/

--HG--
branch : product-engine
2010-07-07 21:02:05 +03:00
Vadim Savchuk 840e33e41e EXT-8168 FIXED Used localized labels when populating 'New Clothes' and 'New Body Parts' submenus of the My Outfits gear menu.
Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/708/

--HG--
branch : product-engine
2010-07-07 20:55:35 +03:00
Alexei Arabadji d68b8ce269 EXT-8154 FIXED Forced removing garbage items from COF.
reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/687/

--HG--
branch : product-engine
2010-07-07 18:35:14 +03:00
Loren Shih aef4f6ccab automated merge 2010-07-07 10:13:09 -04:00
Loren Shih a5522ff5bd EXT-3568 FIXED Outfit Folders sometimes show up as empty until right-clicked
Changed logic to not set descendent count to 0 for problematic folders.
2010-07-07 10:12:37 -04:00
Vadim Savchuk c21b28146f Merge from default branch
--HG--
branch : product-engine
2010-07-07 15:24:38 +03:00
Paul Guslisty ede95f4029 EXT-8149 FIXED (shop button needs a tooltip)
- Added tooltips for Shop buttons

Reviewed by Vadim Savchuk and Neal Orman at https://codereview.productengine.com/secondlife/r/693/

--HG--
branch : product-engine
2010-07-07 14:55:19 +03:00
Paul Guslisty 9dbc0e2cce EXT-7879 FIXED (Edit Classified has duplicate \"Price for Ad\" and unnecessary help link)
- Restored deleted spinner and its label
- Added method to show\hide spinner and its label

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/698/

--HG--
branch : product-engine
2010-07-07 14:48:10 +03:00
Paul Guslisty 3db9ff8990 EXT-8160 FIXED (remove arrow from shop button)
- Replaced the art to the proper

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/700/

--HG--
branch : product-engine
2010-07-07 14:37:18 +03:00
Tofu Linden f85ed5a106 merge from PE's viewer-release 2010-07-07 10:58:48 +01:00
Xiaohong Bao f35b688153 Automated merge with ssh://hg.lindenlab.com/q/viewer-release 2010-07-06 16:32:06 -06:00
Xiaohong Bao b50ab89052 EXT-7983: FIXED: viewer gets confused about position of objects that cross a region boundary.
worked together with davep.
2010-07-06 16:29:07 -06:00
Nyx (Neal Orman) d2d5b46726 Automated merge with ssh://hg.lindenlab.com/q/viewer-release/ 2010-07-06 18:13:56 -04:00
Nyx (Neal Orman) fcfaa69821 EXT-8020 FIX outfit textures are blurry on opening outfit editor
We believe this fix should help with the blurry textures - we weren't
updating our local bake of your avatars' appearance. Added a line to trigger
this refresh.

Code reviewed by Seraph
2010-07-06 18:13:46 -04:00
Loren Shih 5ea8653b3d EXT-8252 FIXED Folders can be dragged into Outfits
Fixed logic to disallow folders from being dragged into outfits.
Also added a bunch of low-risk superficial cleanup such as comments, better local variable declaration, etc.
2010-07-06 17:08:05 -04:00
Loren Shih 419bfb16fd automated merge 2010-07-06 15:49:32 -04:00
Loren Shih ced040f8ae EXT-8244 FIXED Not wearable links could be added to COF by drag-n-drop in the Inventory
Fixed the dnd behavior so that you can only drag appropriate items into the COF or Outfits folder.
Did a bit of superficial code cleanup in terms of adding comments and relocating blocks of code.  The actual coding fix was pretty small despite the diff; most of the diff is superficial cleanup.
2010-07-06 15:47:17 -04:00
Sergei Litovchuk 4591ecc6e4 EXT-8121 FIXED Added updating type specific controls (checkboxes, radio buttons) in Edit Wearable panel upon undo action.
Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/702/.

--HG--
branch : product-engine
2010-07-06 22:44:28 +03:00
Brad Payne (Vir Linden) 7de36b3d42 merge 2010-07-06 14:35:48 -04:00
Brad Payne (Vir Linden) d1d38d6e9d Updated static cache files from hg.lindenlab.com/vir/viewer-cache 2010-07-06 14:34:31 -04:00
Nyx (Neal Orman) 9d96da4b94 EXT-8249 FIX coverity fix - eliminating fallthrough for switch statement
Code reviewed by Seraph
2010-07-06 12:44:43 -04:00
Brad Payne (Vir Linden) 301b670c2e Added back static VFS cache, removed artwork-common tarball (which is currently only used for those two smallish files) 2010-07-06 12:32:24 -04:00
Loren Shih d7a1237f87 EXT-8247 FIXED In-world object info in Edit->General menu clipped
Trivial change to move down the Name: field by a few pixels.
2010-07-06 12:01:25 -04:00