Dave Parks
6abbe4cf55
Automated merge with https://bitbucket.org/lindenlab/viewer-lion
2014-02-28 13:35:03 -06:00
andreylproductengine
d9d2659e11
MAINT-3752: Changed the "Show me in Search result" checkbox caption
2014-02-28 16:47:18 +02:00
Mnikolenko ProductEngine
80ba9cfeb1
MAINT-2613 Two entries for 'DisablePrecacheDelayAfterTeleporting' in settings.xml
2014-02-28 15:37:41 +02:00
Dave Parks
7835d48f6d
Automated merge with https://bitbucket.org/lindenlab/viewer-lion
2014-02-27 18:06:48 -06:00
Dave Parks
a8e22e11c5
MAINT-2980 Rename "Texture Memory" to "Video Memory" in hardware floater and increase limit.
...
Limit should be however much vram is installed, but underneath the hood, fudge
how much memory is used for textures to avoid swapping.
Also, catch exceptions when attempting to build a GL context on windows and
display an error dialog instead of crashing.
2014-02-27 17:49:50 -06:00
simon
7ad70e0f24
Merge downstream code
2014-02-27 13:38:21 -08:00
simon
8b28593c10
Merge downstream code
2014-02-27 13:36:05 -08:00
simon
3f9f8bb8bf
Merge JJ's viewer-release-codesign-workaround
2014-02-27 13:28:56 -08:00
Mnikolenko ProductEngine
3085c6e188
MAINT-3778 Develop>RenderMetadata>LOD Info no longer displays values for objects
2014-02-27 12:22:02 +02:00
Simon Linden
0a46023db5
Fix linux build - make default check in switch statement
2014-02-26 23:52:34 +00:00
James Johnson
556506278a
Merged lindenlab/viewer-release into default
2014-02-26 10:16:07 -08:00
maksymsproductengine
483ad8dc55
MAINT-3555 FIXED crash in LLPanel::~LLPanel() on shutdown:
...
- LLFloaterView::mToolbarRects[3] was transformed to LLRect mToolbarLeftRect, mToolbarBottomRect, mToolbarRightRect;
2014-02-26 20:14:41 +02:00
simon
100b9154dd
MAINT-3555 : crash in LLPanel::~LLPanel() on shutdown. Fixes to be paranoid
...
about the return type for calls to LLView::getParent(): never assume a down
cast is possible.
2014-02-26 12:49:29 -08:00
Mnikolenko ProductEngine
c23aebf89d
MAINT-3746 FIXED After replacing LLEnvManagerNew::setRegionChangeCallback with LLAgent::addRegionChangedCallback we should call RegionChanged callbacks to update NavMesh status.
2014-02-26 12:50:43 +02:00
simon
43e36b7ee3
Merge downstream code
2014-02-25 16:59:46 -08:00
simon
dd8b32473e
Merge downstream code
2014-02-25 16:47:31 -08:00
simon
6f1df3172e
Merge viewer-release
2014-02-25 16:45:19 -08:00
Baker Linden
9c31fab51b
merge
2014-02-25 16:42:44 -08:00
Baker Linden
bd73465e51
[MAINT-3784] - Viewer takes too long to shut down
...
- Removed a lot of logging code to reduce application close time
2014-02-25 16:41:23 -08:00
Mnikolenko ProductEngine
5705a2c018
MAINT-3671 Fix is changed to solve issue with other multi-previews
2014-02-25 17:06:06 +02:00
Richard Linden
0b9eeb02ab
MAINT-2059 FIX Corner scaling doesn't highlight distance text
...
much cleanup of vector math
also made Stretch Both Sides checkbox clickable via label
2014-02-24 18:36:13 -08:00
Oz Linden
de8fea1362
increment viewer version to 3.7.3
2014-02-24 14:50:35 -05:00
Oz Linden
7910c686ca
Added tag 3.7.2-release for changeset b842534cb4d7
2014-02-24 14:50:35 -05:00
akl
16aec9dca7
MAINT-2588 FIXED User cannot delete items from content of other object, using 'Delete' button on keyboard.
2014-02-24 19:30:30 +02:00
Mnikolenko ProductEngine
82cbe36215
MAINT-2062 FIXED Don't show the pie menu if user is not logged in.
2014-02-24 12:56:34 +02:00
JJ Linden
0abdab7848
changed variable names and errors to more accurately reflect the operation being performed
2014-02-21 11:59:17 -08:00
simon
ea944fd58f
Merge downstream code
2014-02-21 11:18:12 -08:00
simon
76913530ed
Merge downstream code
2014-02-21 11:10:16 -08:00
simon
7028d24c2c
Merge oz_linden/viewer-fewerpkgs
2014-02-21 11:00:28 -08:00
Baker Linden
7faaaa9b11
[MAINT-3555] Adding a bajillion log messages to (hopefully) narrow down the cause of the crash
2014-02-20 15:23:53 -08:00
Oz Linden
8ead3308be
remove experimental cdn packages
2014-02-20 16:44:41 -05:00
maksymsproductengine
5ce3207a6f
Fix build problem
2014-02-20 19:45:47 +02:00
maksymsproductengine
ba0b11fee1
Fix build problem
2014-02-20 19:45:47 +02:00
Mnikolenko ProductEngine
a23fc01c7b
MAINT-403 FIXED Update buttons after deleting item by drag-and-drop.
2014-02-20 12:03:26 +02:00
JJ Linden
251bf8ceca
duplicated the workaround added for darwin codesigning onto the windos codesigning
2014-02-19 14:40:27 -08:00
Xiaohong Bao
a8a3daee02
Automated merge with https://bitbucket.org/lindenlab/viewer-lion
2014-02-18 17:20:06 -07:00
Xiaohong Bao
fe73339840
fix for MAINT-2523: Bumpmaps don't load when Lighting & Shadows are enabled.
2014-02-18 17:19:24 -07:00
Aura Linden
800409bdfc
Maint-3135 Discovered apple made this change in 10.6.8 not 10.7.0
2014-02-18 14:11:17 -08:00
Mnikolenko ProductEngine
d1afaf594d
MAINT-3735 FIXED Image names are changed
2014-02-18 17:45:58 +02:00
Mnikolenko ProductEngine
ee9973ac8e
MAINT-3720 Timestamp are added to Places->Teleport History. It is only shown for today and yesterday.
2014-02-18 15:29:35 +02:00
Monty Brandenberg
acb265a394
Merge. Refresh from viewer-release after 3.7.1 release.
2014-02-14 18:49:33 -05:00
Oz Linden
ce7e19d33a
increment viewer version to 3.7.2
2014-02-14 16:00:45 -05:00
Oz Linden
cb9e53414d
Added tag 3.7.1-release for changeset dcb4981ce255
2014-02-14 16:00:45 -05:00
Richard Linden
a347267cf1
cleaned up llmanipscale logic for readability...no change in functionality
2014-02-13 15:35:21 -08:00
Dave Parks
bfe520387e
MAINT-2876 Fix for freeze when editing certain rigged meshes at high altitude.
2014-02-13 17:03:36 -06:00
Mnikolenko ProductEngine
7e291bb468
MAINT-3465 FIXED Add check mark to selected entry.
2014-02-12 12:34:41 +02:00
Monty Brandenberg
7443819560
Merge. Refresh from viewer-release after 3.7.0 release
2014-02-11 13:41:31 -05:00
Mnikolenko ProductEngine
52fe667671
MAINT-2754 FIXED Call findInstance() instead of getInstance().
2014-02-11 13:58:44 +02:00
simon
c0141ac423
Merge
2014-02-10 16:18:27 -08:00
simon
49ade5a719
Pointless merge to make hg happy
2014-02-10 16:16:34 -08:00