Commit Graph

18 Commits (6c7653c65bd3f9907bcd4a8a54e4e5c1d172d15e)

Author SHA1 Message Date
Loren Shih 47781184fc Automated merge up from viewer-development into mesh-development 2011-04-04 10:42:52 -04:00
Oz Linden efa42a6aab merge up to viewer-development 2010-12-04 09:14:58 -05:00
Loren Shih 225ffbba20 Automated merge up from viewer-development 2010-10-27 15:08:21 -04:00
Vadim ProductEngine 7a597cf4f1 STORM-350 FIXED Wrong icon (texture) was displayed for sounds in inventory.
By the way, just for consistency changed LINKFOLDER icon from "Inv_LinkItem" "Inv_LinkFolder".
The icons are equal, so this change has no effect.
2010-10-22 20:47:55 +03:00
Oz Linden a5619d16f7 correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
Dave Parks 7c2b9221d6 merge 2010-09-27 15:20:27 -05:00
Dave Parks 35c81f75ac Fix for bad zipping of meshes and add mesh icon back to repository. 2010-09-24 23:52:32 -05:00
Brad Payne (Vir Linden) 90e3d83a5c Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
Loren Shih 8ff7cfa4f2 EXT-8771 Avatar Physics causes crash on login with release viewer
Added backwards compatibility support for new wearable types.
2010-08-30 14:01:11 -04:00
Loren Shih 981a43b355 Created new wearable type.
Added debug setting for disabling physics.
Added disable-multiwear and disable-camera-reset to wearabletype.
2010-08-23 16:13:10 -04:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Andrew Dyukov 3b88ba4351 EXT-2707 FIXED Fixed incorrectness of coalesced objects icons in inventory.
Bug was caused by multiobject's icon name index substitution with ordinary object's one. It happened because index was set depending on asset type in switch that followed "if" which set index for multiobject regardless of its result.

- Added returning index icon name inside of "if" block to avoid change of the index by switch for multiobject.

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/804/

--HG--
branch : product-engine
2010-07-26 16:58:40 +03:00
Loren Shih e414a91d7f EXT-7430 : Create art overlay for inventory icons that are links
Took out explicit _Link icons and replaced with overlay.
Removed links overlays from non-main-inventory-floater panels.
2010-06-09 17:09:42 -04:00
Loren Shih 25711e6bce EXT-7350 : Grey box appears when opening up calling cards, only partially populated
Fixed incorrect icon name which was causing grey box (i.e. icon not found) error.
2010-05-13 17:07:05 -04:00
Loren Shih 4c03806be9 EXT-7305 : FIXED : Changed LLWearableDictionary to LLWearableType
Fixed mac compile error.
2010-05-11 15:42:06 -04:00
Loren Shih bf8ee42813 EXT-7305 : FIXED : Changed LLWearableDictionary to LLWearableType
Name change LLWearableDictionary.h to LLWearableType.h.
2010-05-11 15:24:27 -04:00
Loren Shih adc0aba2dd EXT-7305 : FIXED : Changed LLWearableDictionary to LLWearableType
Refactored LLWearableDictionary to look more like LLAssetType/LLFolderType/etc. in terms of code design.  This required a lot of superficial changes across many files.  Overall functionality has not changed.
2010-05-11 15:08:29 -04:00
Loren Shih 64da5083d0 EXT-7306 : FIXED : Add shortcut-style icons for inventory links
EXT-7295 : FIXED : INFRASTRUCTURE : Cleaned up Inventory Icon code

Inventory link icons were designed from scratch.
Added LLInventoryIcon class and did some major refactoring for how it determines inventory icons from item bridges.
2010-05-11 13:01:27 -04:00