7835d48f6d
Automated merge with https://bitbucket.org/lindenlab/viewer-lion
2014-02-27 18:06:48 -06:00
0bd5fffcac
Pull merge from viewer-acme
2014-02-27 16:04:17 -08:00
ceec7b7efe
ACME-1333 : Allow Facebook panel to be resized, fixed ensuing follow positioning issues in all subpanels
2014-02-27 16:03:35 -08:00
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
807fa3ee06
Pull merge of codesign workaround
2014-02-27 15:21:39 -08:00
d3c45d65d0
Pull merge of codesign workaround
2014-02-27 15:17:36 -08:00
7ad70e0f24
Merge downstream code
2014-02-27 13:38:21 -08:00
8b28593c10
Merge downstream code
2014-02-27 13:36:05 -08:00
3f9f8bb8bf
Merge JJ's viewer-release-codesign-workaround
2014-02-27 13:28:56 -08:00
eb942229c4
Pull merge from viewer-acme
2014-02-27 13:20:51 -08:00
279e9b0743
ACME-1327 : Implemented preview in all SL Share panels, switch ownership of preview to focused SL Share photo panel
2014-02-27 13:04:23 -08:00
3085c6e188
MAINT-3778 Develop>RenderMetadata>LOD Info no longer displays values for objects
2014-02-27 12:22:02 +02:00
22ea5ac41c
BUG-4260 Updated to 4.6.x vivox libraries for Mac and Windows.
2014-02-26 20:15:45 -08:00
ed38a0aede
ACME-1327 : WIP : Make rescale of preview isotropic, make preview button a toggle
2014-02-26 17:22:16 -08:00
0a46023db5
Fix linux build - make default check in switch statement
2014-02-26 23:52:34 +00:00
d80a812ffc
Changed SLShare photo upload filename to Untitled for the sake of default Flickr title
2014-02-26 20:21:05 +00:00
ac9849fb03
fixed mispelling of generateOutgoingAdHocHash
2014-02-26 11:59:49 -08:00
ccc15df25f
MAINT-3448 FIX: Timestamps disappear from conversation log after viewer restart
2014-02-26 11:58:37 -08:00
556506278a
Merged lindenlab/viewer-release into default
2014-02-26 10:16:07 -08:00
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
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
8fb94a96b1
ACME-1327 : WIP : Update the big preview with size and refresh as well
2014-02-26 06:33:15 -08:00
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
6dfcd7fc2b
ACME-1327 : WIP : Added computation of the big preview, allow big preview to be resizable
2014-02-25 23:01:52 -08:00
d220657d85
ACME-1327 : WIP : Added big preview to the Flickr photo panel, uses the thumbnail for the moment
2014-02-25 21:54:09 -08:00
43e36b7ee3
Merge downstream code
2014-02-25 16:59:46 -08:00
dd8b32473e
Merge downstream code
2014-02-25 16:47:31 -08:00
6f1df3172e
Merge viewer-release
2014-02-25 16:45:19 -08:00
9c31fab51b
merge
2014-02-25 16:42:44 -08:00
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
64c239fbf7
Added machine tags to Flickr uploads for ACME-1323
2014-02-26 00:32:49 +00:00
acc71d628d
fix typo
2014-02-25 17:20:44 -05:00
64816059b6
don't use the simulator channel in the keywords cache file name
2014-02-25 14:44:53 -05:00
057544757c
keywords_lsl_default.xml updates from the simulator tree
2014-02-25 14:14:21 -05:00
1d30fe9554
merge changes for 3.7.2-release
2014-02-25 13:31:01 -05:00
9b42503379
merge latest changes from Ima with 3.6.14-release
2014-02-25 13:30:16 -05:00
895d52a399
merge viewer-release to sunshine-external
2014-02-25 13:25:40 -05:00
5705a2c018
MAINT-3671 Fix is changed to solve issue with other multi-previews
2014-02-25 17:06:06 +02:00
80b4a4a1f5
merge with release
2014-02-24 18:45:59 -08:00
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
8fd270af1c
Pulled from release.
2014-02-24 15:12:04 -08:00
1dd9073571
Pull merge from viewer-maint-2287
2014-02-24 13:53:10 -08:00
3fbaff17bf
Pull merge from viewer-release
2014-02-24 13:42:44 -08:00
245de340d7
Pull merge from viewer-release
2014-02-24 13:23:39 -08:00
de8fea1362
increment viewer version to 3.7.3
2014-02-24 14:50:35 -05:00
7910c686ca
Added tag 3.7.2-release for changeset b842534cb4d7
2014-02-24 14:50:35 -05:00
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
948c0c559d
merge
2014-02-24 11:33:41 -05:00
199e65a6c5
STORM-2015 Region restart sound alerts from all users on a STORM-1980 enabled viewer play inworld - should be local only.
2014-02-24 10:57:53 -05:00
82cbe36215
MAINT-2062 FIXED Don't show the pie menu if user is not logged in.
2014-02-24 12:56:34 +02:00
Dave Parks