summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2010-04-30Manual merge.Vadim Savchuk
By the way, removed "Add to outfit" and "Remove from outfit" buttons from the Edit Outfit panels. --HG-- branch : product-engine
2010-04-30Completed task EXT-6548 (Edit Outfit: correct XUI: update status string, add ↵Vadim Savchuk
t-shirt icon etc.). - Removed temporary "up", "down", "new" buttons. - Fixed misc positions/dimensions/fonts/colors/images. Reviewed by Mike at https://codereview.productengine.com/secondlife/r/343/ --HG-- branch : product-engine
2010-04-30additional fix for EXT-6732 Create specialized view of inventory for ↵Igor Borovkov
"clothing" accordion tab of outfit editor "size_changes" == info["action"] is always TRUE no matter what info["action"] maps to, that should be rewritten to "size_changes" == info["action"].asString() No review. --HG-- branch : product-engine
2010-04-30Fixed normal EXT-6997 (Fav bar: Pop-up menu for LM in overflow dropdown is ↵Paul Guslisty
kept after LM was dragged away) - Added menu hiding on left mouse down callback for drop down menu item Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/337/ --HG-- branch : product-engine
2010-04-30Done normal task EXT-6248 (3 different viewer 2 speakers lists are all ↵Mike Antipov
inconsistent) Turned on "show info button" for lists in group & ad-hoc chats. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/336/ --HG-- branch : product-engine
2010-04-30additional patch for EXT-6732 Create specialized view of inventory for ↵Igor Borovkov
"clothing" accordion tab of outfit editor * reimplemented button bars as static panels not as list items (creating accordion - button bar - list view - adaptor/container) * added management of items' buttons assording to inventory items' states * assigned actions to clothing/bodyparts items' buttons * got rid of separators as distinct items and made them as part of items * removed ad-hoc up/down buttons * removed "+" button from a button bar Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/322 --HG-- branch : product-engine
2010-04-30mergeMike Antipov
--HG-- branch : product-engine
2010-04-30mergeMike Antipov
--HG-- branch : product-engine
2010-04-30WIP: normal bug EXT-6865 (Voice isn't blocked for Avaline callers connected ↵Mike Antipov
via PSTN bridge) Applyied Aimee's patch to enable blocking of avaline caller: added an "External" mute type which isn't sent to the SL servers or stored in the cache across sessions. The caller's ID will change each time so there's no point cluttering up the mute list by persisting them. Known issue: Right now the mute is added with the caller's phone number as the name shown in the block list, so that will need changing to "Avaline Caller 1" etc --HG-- branch : product-engine
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-29Manual mergeDmitry Zaporozhan
--HG-- branch : product-engine
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-28MergeLeyla Farazha
2010-04-28Media sound attentuation first passLeyla 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-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 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
2010-04-28Fixed critical bug EXT-4837 ( [NUX] When filter results in null state, ↵Mike Antipov
provide a message suggesting the user try global search.) Implemented passing of entered filter substring without head spaces to search URI in help message for null filtered results. * Updated setting "no item message" to use search term from filter editor for avatar & group lists and for inventory panels. * Updated appropriate translatable strings to get [SEARCH_TERM] substitution. * Updated processing of filter substring to pass original string to methods applied new filter. Additional necessary changes * Changed place to set "no item message" for group list from refresh to where filter is updated (like in avatar lists) * Removed converting of filter substring to upper case in Places & My Appearance sidepanels (this conversion has already been implemented in where filter is applied) * Added a separate message for Landmarks to set search URI to secondlife:///app/search/places for Lanmarks panel; other inventory related panels have URL to all searched categories (secondlife:///app/search/all) Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/326/ --HG-- branch : product-engine
2010-04-27Architectural changes to LLPlugin message processing.Monroe Linden
LLPluginProcessParent can now optionally use a separate thread for reading messages from plugin sockets. If this is enabled, it will spawn a single thread and use apr_pollset_poll to wake up the thread when incoming data arrives instead of polling all the descriptors round-robin every frame. This should be somewhat more efficient, and should also allow blocking requests from plugins to be serviced much more quickly (once we start using them). This is currently disabled by default, until it's had a bit more focused testing on multiple platforms. Hooked up the switch to use the message read thread to the PluginUseReadThread debug setting and an item in the Advanced menu in the viewer, and to a checkbox in the UI in llmediaplugintest. Updated some debug logging in the plugin system to have appropriate tags and not log dire-looking warnings during normal operation. LLPluginProcessParent now once again explicitly kills plugin processes (instead of just closing their sockets and waiting for them to exit). The problem we were attempting to solve by not doing the kill (letting the webkit plugin write its cookie file on exit) has been solved another way. LLPluginProcessParent::sendMessage() now attempts to write the outgoing message to the socket immediately instead of waiting for the next frame. This should reduce the latency of sending plugin messages. Added a separate fast timer for LLViewerMedia::updateMedia().
2010-04-29merge from PE's viewer-trunkTofu Linden
2010-04-27added empty param blocks to registered widgets that didn't have themRichard Linden
made LLDefaultChildRegistry::Register errors actually crash the client...llerrs doesn't work in static initializers
2010-04-27Additional commit for EXT-6956 (Create perpetual loading indicator widget).Vadim Savchuk
- Made the indicator rotate clockwise (by flipping the images and reversing the order they're traversed). - The textures are now preloaded. Approved by Erica. --HG-- branch : product-engine
2010-04-27mergeRichard Linden
2010-04-27merge.Tofu Linden
2010-04-27local mergeSamuel Kolb
2010-04-27fixed up mime_types.xml files to point to a plugin in all cases.Samuel Kolb
2010-04-27fixed eol and tabs/spaces problemsRichard Nelson