Jeff (Gioffredo Linden)
ee0b66f080
VITA test framework - record events support
2013-07-25 16:07:16 -04:00
Dave Parks
c3f14b915c
NORSPEC-229 Fix for bad binormals on mirrored surfaces (use tangent calculator instead of binormal calculator, convert binormal centric code to tangent centric)
2013-06-03 12:50:48 -05:00
Oz Linden
327c99cadb
merge up to 3.5.2 development
2013-04-16 16:01:32 -04:00
prep@lindenlab.com
f2948cb1eb
Merge with viewer-chui
2013-03-20 17:53:51 -05:00
merov
c294c7c474
CHUI-863 : Clean up dead code that's creating failures on gcc-4.6 builds on Linux
2013-03-16 16:09:50 -07:00
Don Kjer
9150757c81
More fixes for gcc-4.6 breakage
2013-03-13 21:01:50 +00:00
Nyx Linden
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
prep
207d9fd767
Viewer-chui merge
2013-03-11 14:45:53 -04:00
Mnikolenko ProductEngine
9530b9d2b7
CHUI-694 FIXED Handle ALT + Up/Down and ALT + Right/Left to switch conversations in the list. Handle ALT + Enter to expand participant list of selected conversation.
2013-03-01 14:24:47 +02:00
Merov Linden
faae38daaa
Pull merge from lindenlab/viewer-developement
2013-01-30 20:01:03 -08:00
Nyx Linden
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
maxim@mnikolenko
9e6677ffc2
CHUI-692 FIXED Arrow keys will move avatar while IM container, nearby chat or IM session floater is in focus.
2013-01-22 17:53:18 +02:00
Merov Linden
573ab07a40
Merge pull from lindenlab/viewer-beta
2013-01-10 14:51:59 -08:00
Oz Linden
a7dbaaa0af
merge changes for DRTVWR-250
2013-01-08 09:45:27 -05:00
William Todd Stinson
c73947ac1f
CHUI-499: Adding ability to serialize the communication notifications to local disk per user.
2012-12-18 18:48:15 -08:00
William Todd Stinson
0a16fc53cf
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-chui-stinson-merge.
2012-12-12 12:53:24 -08:00
William Todd Stinson
78b7a4b37c
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
2012-12-12 12:48:59 -08:00
William Todd Stinson
b5db495259
CHUI-494: Toggling the behavior of the communication notification channel filter as it should be true when not in DND mode and false when in DND mode.
2012-12-11 18:48:29 -08:00
Logan Dethrow
0302573348
Automated merge with ssh://bitbucket.org/lindenlab/viewer-development
2012-12-11 16:38:10 -05:00
William Todd Stinson
4d3590ae9c
Correcting a mac build error.
2012-12-10 19:14:37 -08:00
William Todd Stinson
9da625d439
CHUI-494: WIP First pass at getting the suppression of events in DND working.
2012-12-06 20:28:25 -08:00
Nat Goodspeed
377544c8b4
merge changes for MAINT-1955, MAINT-1958
2012-12-05 12:05:33 -05:00
simon@Simon-PC.lindenlab.com
40e78a80cc
Pull and merge viewer-development
2012-12-04 14:31:15 -08:00
prep
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
Oz Linden
f5a47417fd
merge changes for DRTVWR-230
2012-11-27 10:53:50 -05:00
William Todd Stinson
67bc42a80a
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
2012-11-20 16:20:40 -08:00
William Todd Stinson
c9044c03b3
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
2012-11-09 18:51:23 -08:00
AlexanderP ProductEngine
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
William Todd Stinson
c4eaaa3d6a
CHUI-484: Updating the code to rather than refer to it as Busy Mode, it now refers to it as Do Not Disturb mode.
2012-11-08 12:35:15 -08:00
Dave Parks
c431ddf629
Automated merge with http://bitbucket.org/lindenlab/viewer-development
2012-11-08 13:05:29 -06:00
William Todd Stinson
b1035e2713
Pull and merge from https://bitbucket.org/lindenlab/viewer-development .
2012-11-06 12:28:41 -08:00
William Todd Stinson
3b39ec165a
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
2012-11-02 17:56:35 -07:00
Oz Linden
02afdef369
merge back fixes from 3.4.1-beta12
2012-11-02 16:48:56 -04:00
Oz Linden
e917620069
merge changes for 3.5.0-beta5
2013-03-26 11:32:31 -04:00
Oz Linden
a7f02a3e51
merge changes for 3.5.0-beta2
2013-03-08 10:10:59 -05:00
Oz Linden
49ed1a4e32
finish changes to update handling, including notices of channel changes
2013-02-27 17:40:39 -05:00
Oz Linden
cf40fc0447
add menu bar background colors for new build/channel scheme
2013-02-21 13:22:25 -05:00
Dave Parks
44a024d2f5
MAINT-646 Fix for leak introduced by optimizations.
2012-10-31 16:00:56 -05:00
Gilbert Gonzales
c320b4878a
merging in latest code
2012-10-17 15:27:39 -07:00
Gilbert Gonzales
3ee73ee98d
warn-on-failure:unix-eol
2012-10-17 15:26:51 -07:00
William Todd Stinson
33bd704c58
Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.
2012-10-17 15:25:12 -07:00
MaximB ProductEngine
8a42d5cea3
CHUI-399 (When user has Pressing Letter Keys starts local chat setting on, first presses of letter keys do not open chat)
...
fixed
2012-10-18 00:04:46 +03:00
William Todd Stinson
8dbd1f5f48
MAINT-1737: Adding a menu option to the Pathfinding menu to allow rebuilding of the region's navmesh.
2012-10-16 18:45:37 -07:00
William Todd Stinson
e4b98970f4
MAINT-1737: Moving files around to replace the Rebake_Region button with a menu option.
2012-10-16 15:30:00 -07:00
Don Kjer
c06c35609c
Updating linux build to gcc4.6
2012-10-11 00:09:04 +00:00
Don Kjer
8c0aa31536
Adding optimization to skip alpha image analysis when it isn't needed.
2012-10-04 00:42:31 +00:00
Nyx (Neal Orman)
f6649fc31f
Merging sunshine-experimental into sunshine-internal
2012-09-27 16:54:18 -04:00
Brad Payne (Vir Linden)
93e210d91f
more state management stuff, DRANO flags for problematic areas
2012-09-26 15:45:58 -04:00
Brad Payne (Vir Linden)
ab83fab72c
error checking, comments for areas needing fix/check in appearance
2012-09-26 11:52:19 -04:00
Brad Payne (Vir Linden)
ae0bb92290
renamed isUsingBakedTextures to more accurate isUsingServerBakes. Commented some areas we are probably using the function incorrectly
2012-09-26 06:36:24 -04:00