970ee73e9a
Fix release merge issues (included upstream changes not yet in release from bear)
2013-10-25 11:48:43 -07:00
90d1c5b367
Merge downstream code for CHUIStorm
2013-08-26 15:45:09 -07:00
27d637d0f1
Merge downstream code from CHUIStorm release
2013-08-26 14:43:23 -07:00
f2b5bfc605
MAINT-2904 FIXED (Users of "LittleSight" viewer are invisible but can listen to spatial chat)
2013-08-22 13:32:56 +03:00
82bf4e4db2
merge changes for DRTVWR-285
2013-08-19 15:15:15 -04:00
d2386652f8
CHOP-962: Make LLControlVariable::setPersist() accept only enum.
...
Initial change made LLControlVariable::mPersist an enum, but retained
bool/BOOL public API. setPersist(true) set one value, setPersist(false) set
another, forcePersist() set the third. Per code review, expose enum to public,
make setPersist() (and LLControlVariable constructor, and LLControlGroup::
declareControl(), and all the LLControlGroup::declareMumble() methods, and all
the unit-test dummy declareMumble() method bodies) accept that enum. Remove
forcePersist(). Fix calls to LLControlGroup::declareMumble() accordingly.
Also rename PERSIST_YES to PERSIST_NONDFT, also per code review.
2013-07-25 16:46:51 -04:00
37048620dd
MAINT-2879 : Viewer should revoke animation permissions with "Stop Animating Me"
...
Reviewed by Kelly
2013-07-11 17:51:20 -07:00
79029149a4
Automated merge with file:///F:%5Cviewer-bear
2013-06-21 12:51:29 -05:00
b3c010ea71
Pull merge lindenlab/viewer-release
2013-06-19 12:24:44 -07:00
043f2e0bfd
Pull from viewer-release
2013-05-02 14:09:40 -07:00
806d09b114
Merge 3.5.1 into Materials
2013-04-30 19:50:05 -07:00
b42b789723
Merge in downstream code (chui fixes, materials)
2013-04-11 16:18:34 -07:00
fa36f85b00
CHUI-797 FIXED Only one separated conversation window is shown after exiting from mouselook view
...
Added all separated conversation floaters to skip list used in gFloaterView->popVisibleAll(skip_list) in llagent.cpp
since LLFloaterIMContainer::setVisible() takes control of them by itself.
2013-04-09 20:50:54 +03:00
d1d0a2cf67
SH-4058 - log spam reduction initiative.
2013-04-03 14:58:33 -04:00
d5561a1ada
Merge in viewer-beta to get CHUI code
2013-03-19 16:20:53 -07:00
207d9fd767
Viewer-chui merge
2013-03-11 14:45:53 -04:00
54cdc322b8
Fixing issues with not detecting when LLSD XML parsing fails. Changing most http error handlers to understand LLSD error responses. Fleshing out most http error handler message spam.
2013-03-05 22:05:22 -08:00
3005bdf7aa
merge
2013-02-28 17:26:14 -05:00
d1c1445193
SH-3909 Support avatar height offset
...
Adding a new visual param that allows users to manually adjust an offset for
how far off the ground (+ or -) their avatar's root bone is.
Supports the +-2m range people are used to adjusting in their viewers, but
new implementation should support server-generated appearances.
2013-02-28 17:25:37 -05:00
b16dcda6a3
SH-3860 WIP, SH-3899 WIP - make folder version management more debuggable, log appearance request results
2013-02-25 19:12:36 -05:00
e82667e3e8
MAINT-2407 'Stop animating me' spams server
...
reviewed with Simon
2013-02-25 14:06:38 -08:00
72dfb2abce
SH-3812 WIP, SH-3852 WIP - some metrics cleanup, added rebake when needed and sb system is unavailable, to avoid stale appearance problems
2013-02-13 17:28:05 -05:00
9ef4c33772
SH-3852 WIP - modified metrics for update_appearance_from_cof and wear_inventory_category, end when bakes are fully loaded
2013-02-13 07:47:24 -05:00
99d197d021
SH-3852 WIP - track per-timer stats
2013-02-07 19:14:00 -05:00
0897a291d1
SH-3852 WIP - small tweaks
2013-02-07 11:14:37 -05:00
3f45d5472c
SH-3800 WIP - log some of sent appearance msg info as well as received
2013-02-01 10:53:02 -05:00
235f77b8c6
SH-3800 WIP - reject appearance messages with contradictory appearance version info
2013-02-01 09:13:31 -05:00
cbf7de4538
SH-3779 WIP, SH-3534 WIP - more bake-status tracking
2013-01-28 13:47:00 -05:00
878e31dce2
SH-3534 WIP - better encapsulation of mUseServerBakes
2013-01-23 16:04:08 -05:00
de9e2c3812
CHUI-668: Code review changes
2013-01-15 20:36:48 -08:00
573ab07a40
Merge pull from lindenlab/viewer-beta
2013-01-10 14:51:59 -08:00
bd6d34d312
CHUI-499: Loading the DND notifications upon exit from DND mode and after login.
2012-12-19 01:48:37 -08:00
1bebff84ba
Removing some old code for parsing the response from changing maturity level as it is now consistent across the grid.
2012-12-17 16:11:52 -08: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
e173dea8a0
Pull and merge from https://bitbucket.org/lindenlab/viewer-development .
2012-11-13 17:03:11 -08:00
4f58b4088a
CHUI-517: Altering the behavior and copy of the main menu status choices. Busy has been replaced with Do Not Disturb. And both status options have been switched to be indicated with a check rather than alternating text.
2012-11-09 14:41:50 -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
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
3aeff074cf
SH-3469 FIX - use callback mechanism to handle possible race between getting caps and setting agent region
2012-10-26 18:27:08 -04:00
c961b5f657
handling for crossing from non-server-bake to server-bake regions
2012-10-22 11:09:32 -04:00
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
e4b98970f4
MAINT-1737: Moving files around to replace the Rebake_Region button with a menu option.
2012-10-16 15:30:00 -07:00
c06c35609c
Updating linux build to gcc4.6
2012-10-11 00:09:04 +00:00
878eb2b61a
audited uses of centralBakeVersion vs. isUsingServerBakes
2012-09-27 17:46:19 -04:00
93e210d91f
more state management stuff, DRANO flags for problematic areas
2012-09-26 15:45:58 -04:00
ab83fab72c
error checking, comments for areas needing fix/check in appearance
2012-09-26 11:52:19 -04:00
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
21c364c4d4
Renamed LLVOAvatarDefines to LLAvatarAppearanceDefines
2012-09-03 09:10:24 +00:00
ae2e611dfb
CHUI-315 (Nearby chat messages do not appear in conversation floater): cancelled inheritance LLNearbyChat from LLSingleton; set mSingleInstance flag for it.
2012-08-31 16:52:50 +03:00
Graham Linden