Commit Graph

22454 Commits (031c3bbcc4c1fdba9b8a2c797ebcac03310df93b)

Author SHA1 Message Date
Jonathan Yap 031c3bbcc4 STORM-1812 / subtask STORM-1861 Media auto-play is off - but music stream starts to play anyway when teleport fails 2012-05-18 16:36:11 -04:00
Jonathan Yap 502e89971f STORM-1812 Tweak how music is restarted for teleport within a parcel 2012-05-14 13:20:06 -04:00
Jonathan Yap 1daac72722 STORM-1812 Music stream does not always restart after teleporting 2012-02-15 08:05:28 -05:00
Oz Linden 289d756ea8 increment viewer version to 3.3.0 2012-02-06 10:01:09 -05:00
Oz Linden 54bc900c95 Added tag 3.2.9-start for changeset 37dd400ad721 2012-02-06 10:00:15 -05:00
Oz Linden 099ce3cbde merge changes for vmrg-222 2012-02-03 18:35:46 -05:00
Richard Linden a89fbc1d33 EXP-1868 FIX Remove Merchant Outbox from Me menu
removed merchant outbox context menu
reviewed by Leslie
2012-02-03 11:14:54 -08:00
Richard Linden 028d9b3b34 EXP-1868 FIX Remove Merchant Outbox from Me menu
reviewed by Leslie
2012-02-03 10:45:14 -08:00
Vadim ProductEngine 36aba26615 EXP-1843 WIP Added an option to output avatar rez timing.
Use the new "Avatar Rez" debugging tag to see the output.
2012-02-03 11:10:13 +02:00
Brad Payne (Vir Linden) 34408bed26 merge 2012-02-01 15:43:11 -05:00
Oz Linden 0e609cc95b increment viewer version to 3.2.9 2012-01-30 16:45:50 -05:00
Oz Linden bd4c629e38 Added tag 3.2.8-start for changeset 89980333c99d 2012-01-30 16:44:58 -05:00
Oz Linden 1ed8faee81 merge changes for vmrg-219 2012-01-30 15:48:44 -05:00
Xiaohong Bao 717a6f3306 Introduce two new parameters "CurlUseMultipleThreads" and "CurlRequestTimeOut" for QA to test Curl. 2012-01-25 18:27:40 -07:00
Xiaohong Bao cc3f90a888 Automated merge with https://bitbucket.org/VirLinden/vir-project-3 2012-01-25 16:30:02 -07:00
Xiaohong Bao 1316f33130 fix for SH-2904: textures remain stuck in HTP state 2012-01-25 16:01:56 -07:00
Dave Parks 63398cd531 SH-2791 Use request class constructor/destructor for keeping track of concurrent requests instead of unreliable increments/decrements sprinkled around the code. 2012-01-24 17:37:20 -06:00
Brad Payne (Vir Linden) 9bbaf3ab14 merge 2012-01-30 10:23:06 -05:00
Oz Linden 4ef9277761 merge changes for vmrg-218 2012-01-24 16:22:23 -05:00
Oz Linden b2f77bee7e merge changes for vmrg-217 2012-01-24 16:21:34 -05:00
Brad Payne (Vir Linden) a2544b18e8 merge 2012-01-24 14:51:47 -05:00
Dave Parks 371534167e merge 2012-01-24 12:59:40 -06:00
Dave Parks e02f007d20 SH-1427 Fix for spot lights not working properly on alpha objects, and fix for alpha lighting of point lights not matching deferred lights. 2012-01-24 12:59:18 -06:00
Brad Payne (Vir Linden) 361efbc07e merge 2012-01-24 11:03:22 -05:00
Leslie Linden ea6cbc7b6b Reverting background fetch on an item to the old fetFromServer call to fix regression bug in inventory late loading 2012-01-23 15:55:36 -08:00
Leslie Linden 83ca425158 Reverting rev 22217 changes to background fetch so search and recent will fully fetch user inventory 2012-01-23 15:34:01 -08:00
Leslie Linden ca9f000289 * Optimization to not waste some time doing std::string assignment all over the graphics code.
Reviewed by davep.
2012-01-23 13:40:20 -08:00
Leslie Linden e2d4309ba5 EXP-1799 FIX -- Replace and Add to Outfit options and Copy to Merchant Outbox options can appear in invalid state when a valid folder is last selection
EXP-1834 FIX -- Right click context menus on Folders in Merchant Outbox and Library folders can show all inventory options including admin options
EXP-1835 FIX -- Right clicking on a folder and selecting New Folder creates folder under My Inventory not within selected folder

* Updated folder context menu building to build full options in one step or
  trigger a load which will rebuild top-level context menu for all selected
  items when complete.  Previous code had an implicit assumption that the
  selected folder was the only selection after background fetch.
2012-01-23 11:45:47 -08:00
Oz Linden e377182c04 merge changes for storm-1799 2012-01-23 14:17:21 -05:00
Oz Linden 04452c96e1 merge changes for storm-1798 2012-01-23 14:16:29 -05:00
Oz Linden f93126e1ea merge changes for storm-1796 2012-01-23 14:15:55 -05:00
Oz Linden 37e04247d9 merge changes for storm-1788 2012-01-23 14:14:57 -05:00
Oz Linden 79f1cd0a73 merge back changes from viewer-beta branch 2012-01-23 14:10:01 -05:00
Oz Linden c3fa42e26c merge back tags from pre-release branch 2012-01-23 14:09:15 -05:00
Oz Linden b25ba94f05 merge back tags from release branch 2012-01-23 14:06:56 -05:00
Leslie Linden 039cd701c4 * Modified so "Copy" context menu option is not available for "no copy" items. 2012-01-20 16:36:25 -08:00
Leslie Linden c8a2f6515a EXP-1799 FIX -- Replace and Add to Outfit options appear as grayed out in Inventory
* Refactored LLFolderBridge::buildContextMenu fetch to clear and rebuild basic
  context menu options after the fetch rather than trying to merge the two.
2012-01-20 16:10:32 -08:00
Xiaohong Bao 7595d8432d Automated merge with https://bitbucket.org/VirLinden/viewer-development-shining-fixes 2012-01-20 15:51:07 -07:00
Xiaohong Bao 0bf73f73b8 trivial: remove debug code for SH-2828 [crashhunters] Crash in LLRefCount::unref(), bad stacks 2012-01-20 15:48:51 -07:00
Dave Parks 18e7f1bffd SH-2889 Add visual auto-muting controls 2012-01-20 16:42:57 -06:00
Leslie Linden a73013f708 EXP-1799 FIX -- Replace and Add to Outfit options appear as grayed out in Inventory
* Modified build context menu code to not disable items that are invisible so
  secondary background fetch can coalesce menu options with proper state.
* Removed "Move to Merchant Outbox" context menu option.
2012-01-20 13:41:43 -08:00
Xiaohong Bao 9e6a5d7211 fix for SH-2823 and SH-2824: LLCurl crash inside LLBufferArray::countAfter() and LLBufferArray::copyIntoBuffers 2012-01-20 11:55:15 -07:00
Richard Linden f42a8a768c fixed build 2012-01-19 20:00:42 -08:00
Richard Linden 29ad432c8b made layoutPanels have constant user_resize and auto_resize attributes 2012-01-19 19:52:49 -08:00
Richard Linden 9de0b5ed48 Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge/ 2012-01-19 19:41:15 -08:00
Richard Linden a662b888ed EXP-1824 FIX Received Items panel does not collapse correct when Height of panel is maximized in Inventory window 2012-01-19 19:40:46 -08:00
Leslie Linden 216ac70043 EXP-1829 FIX -- Selecting a valid item last allows other selected invalid items to be copied to Outbox with context menu option
* Updated context menu default enabled state to use the last state rather than
  TRUE.  Once per frame, the states are all reset to TRUE so this has the effect
  of AND'ing together successive buildContextMenu functions rather than ignoring
  previous states.
2012-01-19 15:24:29 -08:00
Leslie Linden bcdecbdae1 EXP-1828 FIX -- Drag and drop to an open folder in the outbox causes it to close automatically
* Updated auto-open behavior to ignore items that are already open.
2012-01-19 14:23:01 -08:00
Leslie Linden 00fc2d5a5c * Added member variables to avoid several per-frame getChild calls. 2012-01-19 13:54:32 -08:00
Leslie Linden bb79bbf320 EXP-1827 FIX -- Drag area in outbox does not always highlight green when indicating a top level drop
* Updated the outbox drop area highlight to include top level drops within the
  outbox inventory panel itself.
2012-01-19 13:53:48 -08:00