summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-05-01mergeDave Parks
2010-05-01Rigged attachment integration WIP.Dave Parks
2010-04-30EXT-7162 90% transparent textures are invisible when Lighting and Shadows ↵Tofu Linden
are enabled (transplanted from 0aaf4b4676f27560cc436d0ff74b7d812a1e6662)
2010-04-30expand EXT-7149 fix to include bumpyshiny.Tofu Linden
(transplanted from 57e136beedee9122dbbf46a1d91f6514f058b829)
2010-04-30more tweakery for EXT-7149 objects with white color and varied texture do ↵Tofu Linden
not appear shiny with deferred rendering (transplanted from 36680184ec50ecf5fff92ee33db711b7512d923a)
2010-04-30merge from viewer-trunkTofu Linden
2010-04-30EXT-7149 objects with white color and varied texture do not appear shiny ↵Tofu Linden
with deferred rendering (transplanted from 778a5a83ef4e5e70652fbc00f2e1f8375e587afc)
2010-04-30Looks like the linux apr version is a bit too old to build 5458d58b4cd0. ↵Tofu Linden
Use this workaround for now.
2010-04-30merge from PE's viewer-trunkTofu Linden
2010-04-30Partially implemented normal sub-task EXT-6548 (Edit Outfit: Clean up XUI to ↵Eugene Mutavchi
allow all elements to fit properly in the panel) - added dummy space between buttons. Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/331/ --HG-- branch : product-engine
2010-04-29Fixed normal bug EXT-7059 (Need to add tool-tip for 'Share' verb button on ↵Andrew Dyukov
'People' side panel). - Added "Share an inventory item" tooltip for button in xml. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/338/ --HG-- branch : product-engine
2010-04-29(EXT-6722) Create modified inventory view for "my outfits" tab in top-level ↵Sergei Litovchuk
appearance sidebar (tier 2) llui: - Added accordion tab title setter. - Added setters for accordion tab focus changes callbacks. newview: - Fixed observer used for outfit items collecting. Added checking number of fetched items. - Added outfit selection and enabled "replace outfit" and "add to outfit" commands for selected outfit. Reviewed by Mike Antipov https://codereview.productengine.com/secondlife/r/332/ --HG-- branch : product-engine
2010-04-29Fixed EXT-7163(normal) - Create dummy inventory item panel (an item panel ↵Dmitry Zaporozhan
for unworn wearable types) Added new wearable list item - LLPanelDummyClothingListItem for not worn wearable types, it displays grayed wearable type icon, grayed title '<clothing type> not worn' and 'add' button. Modified base class to be more flexible. Moved init() to protected section. Modified COF panel to use dummy item. Reviewed by Mike Antipov - https://codereview.productengine.com/secondlife/r/335/ --HG-- branch : product-engine
2010-04-29fixed EXT-6736 Notecard floater missing Keep/Discard Buttons (vwr 2.0)Alexei Arabadji
Added missing 'Delete' button to the Notecard Preview dialog; reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/330/ --HG-- branch : product-engine
2010-04-29fixed EXT-6736 Notecard floater missing Keep/Discard Buttons (vwr 2.0)Alexei Arabadji
Added functionality to close hidden IM toasts when IM floater opens. reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/321/ --HG-- branch : product-engine
2010-04-29mergeVadim Savchuk
--HG-- branch : product-engine
2010-04-29Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-04-29Fixed major bug EXT-7114 (Preferences plain text chat history also modifies ↵Paul Guslisty
IM history) - Changed old label with new one. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/333/ --HG-- branch : product-engine
2010-04-29Fixed normal bug EXT-5377 (Viewer crashes if \"My Appearance\" tab has been ↵Paul Guslisty
pressed in offline mode) - Added checking for a null pointer Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/329/ --HG-- branch : product-engine
2010-04-29Update for EXT-6550(major) - Edit Outfit: Fix alignment of in-line edit ↵Dmitry Zaporozhan
button and put proper icon on it Replaced 'lock' button with icon. --HG-- branch : product-engine
2010-04-29merge from viewer-trunkTofu Linden
2010-04-29merge from PE's viewer-trunkTofu Linden
2010-04-29Manual mergeDmitry Zaporozhan
--HG-- branch : product-engine
2010-04-28Fixed default pan value in mac volume catcher, and corrected the filename in ↵Monroe Linden
the header comment.
2010-04-29Incorporate suggestions from Richard's review of the LLPlugin changes.Monroe Linden
Use LLMutexLock (stack-based locker/unlocker) for the straightforward cases instead of explicit lock()/unlock(). There are still a couple of cases (one overlapping lock lifetime and two loops that unlock the mutex to call another function inside the loop) where I'm leaving explicit lock/unlock calls. Rename LLPluginProcessParent::sPollThread to sReadThread, for consistency. Made the LLPluginProcessParent destructor hold mIncomingQueueMutex while removing the instance from the global list -- this should prevent a possible race condition in LLPluginProcessParent::poll(). Removed a redundant check when calling LLPluginProcessParent::setUseReadThread().
2010-04-28adding eolLeyla Farazha
2010-04-28MergeLeyla Farazha
2010-04-28Media sound attentuation first passLeyla Farazha
reviewed by Richard
2010-04-28Rapid clicks on spin ctrl brokenLeyla Farazha
reviewed by Richard
2010-04-28IT linguisticEli Linden
2010-04-28Automated merge with ssh://hg.lindenlab.com/q/viewer-trunkXiaohong Bao
2010-04-28fix for EXT-7159: textures are not fully loaded when http-texture is enabled.Xiaohong Bao
and EXT-6928: Viewer crashes immediately after enabling HTTP Textures on a http-texture-server-1 simulator
2010-04-28merge from viewer-trunkTofu Linden
2010-04-28merge from PE's viewer-trunkTofu Linden
2010-04-28merge from viewer-trunkTofu Linden
2010-04-28Compile error fix for missing description field in link_inventory_item.Loren Shih
2010-04-28automated mergeLoren Shih
2010-04-28Fixed EXT-6550(major) - Edit Outfit: Fix alignment of in-line edit button ↵Dmitry Zaporozhan
and put proper icon on it Replaced LLPanelInventoryListItem with LLPanelInventoryListItem. This class is capable of showing widgets on left and right sides of panel. Implemented LLPanelClothingListItem and LLPanelBodyPartListItem - makes use of new LLPanelInventoryListItem and is able to show buttons specified in tickets. Buttons are shown on mouse_enter event and hidden on mouse_leave event. Buttons are - delete, move up, move down, lock, edit. It's item's user responsibility to control buttons visibility. Made LLInventoryItemsList::addNewItem virtual to allow inheritors create specific(non-default) items. Reviewed by Mike Antipov - https://codereview.productengine.com/secondlife/r/325/ --HG-- branch : product-engine
2010-04-28mergeMike Antipov
--HG-- branch : product-engine
2010-04-28Fixed linux buildPaul Guslisty
--HG-- branch : product-engine
2010-04-28mergeMike Antipov
--HG-- branch : product-engine
2010-04-28Merge with default branchMike Antipov
--HG-- branch : product-engine
2010-04-28partial implementation of EXT-6723 Create specialized view of inventory for ↵Igor Borovkov
"clothing" accordion tab of outfit editor - added grouping clothing items by wearable type (shirt, jeans etc.) - added sorting clothing items by wearing order in groups - added separators between items of the same wearable type (lists: clothing, body parts) - added list specific button bars - partially added dummy items for missing wearable types in the COF (clothing list) Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/322 --HG-- branch : product-engine
2010-04-28Fixed Windows build after chengeset (15508dc34f63) Implemented major task ↵Mike Antipov
EXT-6979 (Connect wearable editor texture and color edito...: added default bodies for overloading of function templates removed qualifier before PickerControlEntry class name. --HG-- branch : product-engine
2010-04-28Implemented major task EXT-6979 (Connect wearable editor texture and color ↵Eugene Mutavchi
editors to the textures stored in the wearables themselves): - added PickerControlEntry - dictionary entry which contains information about particular picker control - added ColorSwatchCtrls and TextureCtrls - lists of PickerControlEntries, contain information about color and texture controls for particular EWearableType - implemented some helper functions for picker management Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/327/ --HG-- branch : product-engine
2010-04-28Fixed low bug EXT-6776 ([FRAGMENTATION] Call strings need change).Andrew Dyukov
- Removed string fragmentation by changing concatenation of name and action to whole-sentence strings. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/328 --HG-- branch : product-engine
2010-04-28merge from viewer-trunkTofu Linden
2010-04-28merge from PE's viewer-trunkTofu Linden
2010-04-28Improved xml file according to Eric's suggestion: controls are not intended ↵Mike Antipov
to be translated marked with translate="false" attribute. Trivial, not reviewed. --HG-- branch : product-engine
2010-04-28mergeMike Antipov
--HG-- branch : product-engine