summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-04-24DEV-39786 (SNOW-572 / SNOW-220 / VWR-14712): GL_COLOR_INDEX8_EXT not defined ↵Aimee Linden
as GL_EXT_paletted_texture is deprecated. Imported from Snowglobe.
2010-04-24EXT-7055: Re-remove old MAP_SCALE_* constants removed in DEV-30614 that have ↵Aimee Linden
snuck back in
2010-04-24Automated merge with ssh://hg.lindenlab.com/q/viewer-trunkAimee Linden
2010-04-24EXT-7005 : Kill unhelpful 'Deprecated conversion from string to char *' ↵Aimee Linden
warnings from fmod_errors.h when building with GCC >=4.2 on Darwin Apply -Wno-write-strings compile flag to llaudioengine_fmod.cpp and llstreamingaudio_fmod.cpp on Darwin as it was on Linux (Amen). Removed unnecessary check for GCC >= 4.2 when applying this flag, as CXX_VERSION_NUMBER it used is only being generated in 00-Common.cmake on Linux at the moment and 4.0 understands -Wno-write-strings anyway.
2010-04-23Add a way for plugins to send a message and block waiting for the responseMonroe Linden
This requires some cooperation between the plugin and the host, and will only work for specific messages. The way it works is as follows: * the plugin sends a message containing the key "blocking_request" (with any value) * this will cause the "send message" function to block (continuing to pull incoming messages off the network socket and queue them) until it receives a message from the host containing the key "blocking_response" ** NOTE: if the plugin sends a blocking_request that isn't set up to cause the host to send back a blocking_response, it will block forever * the blocking_response message will be handed to the plugin's "receive message" function _immediately_ (before the "send message" function returns) ** this means that the plugin can extract response data for use by the the code that sent the message (but is still blocked inside the "send message" call) ** NOTE: this BREAKS the invariant stating that the plugin's "receive message" function will never be called recursively, and the plugin MUST be prepared to deal with this * after the plugin finishes processing the blocking_response message, the "send message" function that was called with the blocking_request message will return to the plugin * any queued messages will be delivered after the outer invocation of the plugin's "receive message" function returns (as normal) Inside the viewer, the code can tell when a plugin is in this blocked state by calling LLPluginProcessParent::isBlocked(). LLPluginClassMedia uses this to avoid sending mouse-move and size-change messages to blocked plugins.
2010-04-28merge from PE's 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-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-27DEV-49349 : AIS hides broken inventory links after a relogLoren Shih
inventory_and_asset_types_match is always true for links (i.e. links should not have to be a certain inventory type).
2010-04-27Small XML fix for Inventory Floater, which was obscuring the text showing ↵Loren Shih
the number of items fetched.
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-27EXT-7109 : Ensure "Open" works for all types, change to "Open Original" for ↵Loren Shih
links Added new "Open Original" menu item for links, to clarify that you're opening the item the link is pointing to.
2010-04-27EXT-7076 : Allow "paste as link" for any itemLoren Shih
Changed llassettype dictionary table to enable linking to most item types.
2010-04-27EXT-7108 Creating link to openable item should not open the item (e.g. notecard)Loren Shih
When you create a link to a notecard, you'll no longer open the notecard.
2010-04-26EXT-7076 : Allow "paste as link" for any itemLoren Shih
EXT-7077 : Enable paste as link for folders Took out code that was stopping paste for god-mode only. Now everyone can do it. Corrected a bool logic error for protected folder restrictions.
2010-04-23FR linguisticEli Linden
2010-04-23Related to normal bug EXT-6302 (TP requests need to display destination ↵Eugene Mutavchi
region maturity) - added displaying maturity rating with an icon. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/229/. --HG-- branch : product-engine
2010-04-23Fixed normal bug EXT-6893 (Corrupted 'Connecting to conference' notification ↵Andrew Dyukov
is shown while connecting to ad-hoc voice chat). Bug consisted of two problems- showing empty outgoing call floater and corrupted text in outgoing call floater. First was ad-hoc and group call specific and was caused by not showing appropriate text for STATE_READY voice channel state. Second was caused by too small space between "Connecting to..." and "Leaving..." textboxes, which enden in their collision for long names. - First problem was fixed by adding STATE_READY case into appropriate switch where textboxes are made visible. - Second was solved by placing "Leaving..." textbox lower Reviewed by Vadim Sachuk at https://codereview.productengine.com/secondlife/r/310/ --HG-- branch : product-engine
2010-04-23fixed EXT-6891 Region name SLurl is absent ot teleport offer toast if long ↵Alexei Arabadji
message was added Decreased limit of teleport offer text invitaton to 178 characters(254 - max_location_url_length(76)) reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/302/ --HG-- branch : product-engine
2010-04-23Work on task EXT-6722 (Create modified inventory view for "my outfits" tab ↵Mike Antipov
in top-level appearance sidebar) Code improvements: * Moved Accordion tab + Flat list into separate xml. * Implemented dynamic creation of the accordion tab via xml Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/312/ --HG-- branch : product-engine
2010-04-23Fixed bug EXT-6798 (Crash in LLTeleportHistoryStorage).Vadim Savchuk
Reason: Attempt to purge empty teleport history resulted in inconsistent history state. There were two consequences: 1) Further teleports would not properly update the history. 2) Subscribers of history changes were notified of the invalid change and that led to the crash. My changes: - added a sanity check to LLTeleportHistoryStorage::onTeleportHistoryChange() to prevent the crash - purging empty teleport history now does nothing, hence the history doesn't become inconsistent - removed a redundant (but harmless) call to onTeleportHistoryChanged() from LLNavigationBar::draw() because it's called by LLTeleportHistory::purgeItems() anyway Reviewed by Mike at https://codereview.productengine.com/secondlife/r/304/ --HG-- branch : product-engine
2010-04-23mergeIgor Borovkov
--HG-- branch : product-engine
2010-04-23mergeIgor Borovkov
--HG-- branch : product-engine
2010-04-23fixed linux buildIgor Borovkov
no review, no jira issue --HG-- branch : product-engine
2010-04-23mergeYuri Chebotarev
--HG-- branch : product-engine
2010-04-23fix for EXT-6999 Group creation panel: pop-up menu for empty group title ↵Yuri Chebotarev
editfield has 'Delete' item enabled reviewed Mike Antipov https://codereview.productengine.com/secondlife/r/307/ --HG-- branch : product-engine
2010-04-23EXT-6970 Title of attachment from previously viewed group can be found in ↵Yuri Chebotarev
current group while viewing notices reviewed Mike Antipov https://codereview.productengine.com/secondlife/r/306/ --HG-- branch : product-engine
2010-04-23fix EXT-6766 The number of characters allowed in the Chat Edit Window in ↵Yuri Chebotarev
Vewer 2 is 1/2 that in Vewer 1 reviewed Mike Antipov https://codereview.productengine.com/secondlife/r/305/ --HG-- branch : product-engine
2010-04-23fix for EXT-5839 Creating a new wearable in a localized viewer attempts to ↵Yuri Chebotarev
use non-ascii characters for inventory types in some languages reviewed Richard Nelson https://codereview.productengine.com/secondlife/r/61/ --HG-- branch : product-engine
2010-04-23mergeVadim Savchuk
--HG-- branch : product-engine
2010-04-23Manual merge from default branch.Vadim Savchuk
Semi-automatically resolved conflicts in: * BuildParams * indra/newview/CMakeLists.txt * indra/newview/llviewermessage.cpp --HG-- branch : product-engine
2010-04-23mergeIgor Borovkov
--HG-- branch : product-engine
2010-04-23completed EXT-6721 (Enable UI for user modification of wearable order)Igor Borovkov
- added functionality to change order of wearables - added ad-hoc up and down buttons on a button bar ("up" means closer to the body) - https://jira.secondlife.com/secure/attachment/38464/screenshot-1.jpg - added displaying wearables as sorted by order on the Edit Outfit panel (top list) Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/280/ --HG-- branch : product-engine
2010-04-23Related to EXT-1655 ([BSI] Always flying after pressing "Stand" to stand up ↵Eugene Mutavchi
from an object) - disabled forcing of flying at autopilot stops (for "Sit" autopilot behavior). Reviewed by Tofu Linden at https://codereview.productengine.com/secondlife/r/253/ --HG-- branch : product-engine
2010-04-23mergeTofu Linden
2010-04-23Backed out changeset 4627863f43d5Tofu Linden
back-out this backout. change made in viewer-trunk, reverted in viewer-hotfix, but we want it preserved post-merge.
2010-04-23merge from viewer-hotfixTofu Linden
2010-04-23merge from PE's viewer-trunkTofu Linden