efa839b75a
merge changes for 3.5.3-beta6
2013-05-16 14:37:14 -04:00
ffec03515e
MAINT-2665: fix crashes being counted as wrong type in last_exec_event due to log macro wrapper
2013-05-15 15:45:30 -04:00
c334a185f3
NORSPEC-151 NORSPEC-152 fix handling of disable of bumpy and shiny in graphics panel to also disable deferred properly and add hooks for default norm and spec textures in texture picker
2013-05-14 05:59:48 -07:00
e1c1428569
Merge viewer-dev-materials and bugfix in LLPanelFace::getState using material instead of mMaterial
2013-05-11 20:38:23 -07:00
e413f4b335
Fixup merge diffs
2013-05-10 15:13:07 -07:00
4d22c32aa9
merge changes for 3.5.2-beta4
2013-05-10 10:56:40 -04:00
d8f00dd1d1
MAINT-2665 FIX Crashes not being reported in some cases
...
made marker file lock use append, not truncate
2013-05-09 10:54:32 -07:00
1b984d8f40
merge changes for 3.5.1-release
2013-05-08 14:46:00 -04:00
025c890958
Merge vwr-dev-mat
2013-05-01 08:11:15 -07:00
806d09b114
Merge 3.5.1 into Materials
2013-04-30 19:50:05 -07:00
3bb708d706
merge up to latest viewer-development for merge to 3.5.2
2013-04-19 14:42:56 -04:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
88eff41649
Merge with viewer-development
2013-04-17 13:38:04 -07:00
327c99cadb
merge up to 3.5.2 development
2013-04-16 16:01:32 -04:00
ce0dbbd8a5
Add reporting of last_exec_duration
...
(and clean up logic around multiple instances)
2013-04-02 12:57:09 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
5c19f15dca
Removed avatar stuff from asset metrics, again. Must have gotten broken in a merge at some point.
2013-03-20 11:43:34 -04:00
1586107e87
SH-3944 WIP CHUI merge fixing
...
re-introduced don's refactor of low-level openGL calls pulling out of llui
and putting them into llrender. Took the new code from their updated versions
from the CHUI merge, but put them in a place accessible to appearance utility.
2013-03-12 22:34:15 +00:00
8e3b190e91
merge
2013-03-11 15:17:13 -04:00
e0c9174609
merge
2013-03-11 15:05:47 -04:00
207d9fd767
Viewer-chui merge
2013-03-11 14:45:53 -04:00
741821eb6a
SH-3867 FIX - on logout, wait for any pending metrics uploads to complete
2013-02-15 09:52:11 -05:00
f3e407ae3f
SH-3852 WIP - removed avatar metrics from ViewerAssetMetrics
2013-02-11 13:50:26 -05:00
99d197d021
SH-3852 WIP - track per-timer stats
2013-02-07 19:14:00 -05:00
b0f2f02333
Removed (most) references to older FMOD library - still a little Linux clean up left
2013-02-01 08:44:52 -08:00
faae38daaa
Pull merge from lindenlab/viewer-developement
2013-01-30 20:01:03 -08:00
e179add865
CHUI-667: Attempting to correct Mac/Linux build issue.
2013-01-29 11:02:23 -08:00
4c5790d4bf
CHUI-667: Post code review changes
2013-01-28 18:27:54 -08:00
c418d61627
CHUI-667 Upon exit from DND mode, a maximum of one sound should be played. Solution. Added a deferred sound class which will have sound id's added to it and upon unmuting the deferred sounds will be played.
2013-01-25 17:47:36 -08:00
11fe124ae9
merging in viewer-beta.
...
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
2013-01-24 16:22:49 -05:00
573ab07a40
Merge pull from lindenlab/viewer-beta
2013-01-10 14:51:59 -08:00
e83700b56d
MAINT-1991 Attempt to mitigate crashes in GL drivers by encouraging people to update their drivers.
...
Reviewed by Simon
2012-11-30 17:03:12 -06:00
e0432f98ee
SH-3563. Pull and merge from viewer-development. Modest code changes to fix alignment issue in llAppearance.
2012-11-28 16:36:34 -05:00
67bc42a80a
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
2012-11-20 16:20:40 -08:00
5d34ac552f
Automated merge with https://bitbucket.org/lindenlab/viewer-development
2012-11-20 17:03:55 -06:00
7ab282a09c
merge changes for DRTVWR-246
2012-11-20 11:30:31 -05:00
c9044c03b3
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
2012-11-09 18:51:23 -08:00
486bdf3284
CHUI-337 FIXED: To avoid confusion with a classes "...conversation..." and in accordance with the naming convention in the project, some classes and corresponding files should be renamed:
...
LLIMConversation -> LLFloaterIMSessionTab
LLIMFloater -> LLFloaterIMSession
LLNearbyChat -> LLFloaterIMNearbyChat
LLIMFloaterContainer -> LLFloaterIMContainer
LLNearbyChatBarListener -> LLFloaterIMNearbyChatListener
LLNearbyChatHandler -> LLFloaterIMNearbyChatHandler
2012-11-09 12:45:36 +02:00
adacf00aad
Automated merge with http://bitbucket.org/lindenlab/viewer-beta
2012-11-07 16:14:31 -06:00
a36b66bd14
MAINT-1815 Fix for excessive memory usage in Mayfair. Disable tcmalloc. Disable private memory pools. Make viewer large address aware on windows.
...
Reviewed by Kelly
2012-11-07 16:03:54 -06:00
e3524a5fe1
CHUI-468 : Suppress LLCallFloater completely
2012-11-05 15:53:31 -08:00
060a76daa6
storm-1850: ensure that last exec event reports apply only to the same version
2012-10-31 21:22:52 -04:00
c17db85e73
add platform and platform version to login request parameters for new version manager query
2013-03-27 13:20:48 -04:00
a7f02a3e51
merge changes for 3.5.0-beta2
2013-03-08 10:10:59 -05:00
49ed1a4e32
finish changes to update handling, including notices of channel changes
2013-02-27 17:40:39 -05:00
13fe905b24
disable willing-to-test for Test viewers
2013-02-25 16:44:31 -05:00
cf1019859d
add use of v1.1 update request protocol, with fallback to v1.0
2013-02-21 16:47:52 -05:00
d7e90f4160
derive version number from indra/VIEWER_VERSION.txt
2013-02-07 11:56:57 -05:00
9da9b2d84b
Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.
2012-10-17 14:32:29 -07:00
d6e3b0445a
Merge in viewer-development code and fix build
2012-10-15 14:23:29 -07:00
Oz Linden