summaryrefslogtreecommitdiff
path: root/indra/llui
AgeCommit message (Collapse)Author
2013-09-04mergeBrad Payne (Vir Linden)
2013-08-22mergeBrad Payne (Vir Linden)
2013-08-19merge changes for DRTVWR-285Oz Linden
2013-08-19merge changes for 3.6.3-releaseOz Linden
2013-08-16merge with viewer-releaseNyx Linden
2013-08-14BUG-3605 / CHUIBUG-197 Don't create excessive amounts of string objects in ↵Nicky
LLNormalTextSegment::getNumChars.
2013-08-07merge changes for DRTVWR-333Oz Linden
2013-07-25CHOP-962: Make LLControlVariable::setPersist() accept only enum.Nat Goodspeed
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-06-22build fixmberezhnoy
2013-06-20Automated merge with http://bitbucket.org/lindenlab/viewer-releaseDave Parks
2013-06-20CHUI-809 (Right-click menu on user name in compat chat mode doesn't have "IM")mberezhnoy
Fixed "Add friend" option always being greyed out, add ability to block object via context menu in compact chat mode.
2013-06-19Pull merge lindenlab/viewer-releaseMerov Linden
2013-06-18merge with viewer-releaseNyx Linden
2013-06-17Fixed build issuemsavchenko@ubuntu
2013-06-17merge changes for 3.6.0-releaseOz Linden
2013-06-14WIP: sh-4035 backed out changes to appearance window confirmationprep@lindenlab.com
2013-06-13CHUI-809 (Right-click menu on user name in compat chat mode doesn't have "IM")mberezhnoy
Added callback for friendship checking
2013-06-11CHUI-926 FIXED FUI button will stay highlight(orange) if there are unread ↵Mnikolenko ProductEngine
IMs when the conversation floater is minimized.
2013-06-07Removed some debug trackingprep@lindenlab.com
2013-06-07Merge MAINT-2740 crash fixGraham Madarasz
2013-06-06merge changes for 3.5.3-releaseOz Linden
2013-06-05Unwind cruft from hunting for 2707 they won't end up in vwr-dev-matGraham Madarasz
2013-06-05CHUI-964 ADD FIX Oversized "To" input field hides actual IM textPavelK ProductEngine
2013-06-05BUG-2707 fix comment typos, remove unnecessary winmm_shim changes, and ↵Graham Madarasz
revert 2672 fix included only for local integ test
2013-06-04MAINT-2740 convert to std::string based API for OutputDebug wrapper ↵Graham Madarasz
cleanliness after sage counsel (slight refrain)
2013-06-04MAINT-2740 fix XUI callsites in debug modeGraham Madarasz
2013-06-04MAINT-2740 and MAINT-2672 rework after code review for 2740 fix and include ↵Graham Madarasz
2672 fix needed for doing local integ tests
2013-06-04MAINT-2740 make use of OsOutputDebugString _DEBUG only to avoid interactions ↵Graham Madarasz
between Win 32-bit SEH and boost coroutine fiber stack handling
2013-06-04BUG-2707 make use of OsOutputDebugString _DEBUG only on Windows to avoid ↵Graham Madarasz
throwing unhandlable exceptions in coroutines in RelWithDebInfo builds
2013-06-03BUG-2707 and not break use of venerable ifdefsGraham Madarasz
2013-06-03BUG-2707 disable sites calling OsOutputDebugString directly to identify ↵Graham Madarasz
which is tossing our errant exception
2013-06-03SH-4035 spec change. If you revert after quiting, SL shutsdown.prep
2013-06-03Fix for sh-4221 Sometimes ctrl+q needed to be hit twiceprep
2013-06-04CHUI-957 FIXED Missing line was added.Mnikolenko ProductEngine
2013-05-31CHUI-941 [CHUIBUG]Inline input is not available in 3.5.0maksymsproductengine
2013-05-30Pull merge from lindenlab/viewer-releaseMerov Linden
2013-05-30CHUI-942 FIXED Choose Resident picker problemsmaksymsproductengine
2013-05-29Merge latest viewer-releasesimon
2013-05-28Sh-4035: Updated implementation according to new specs. Fixed a couple of ↵prep@lindenlab.com
outstanding bugs.
2013-05-24CHUI-964 FIXED Oversized "To" input field hides actual IM textPavelK ProductEngine
2013-05-22Pull merge from viewer-releaseMerov Linden
2013-05-22Pull merge from viewer-releaseMerov Linden
2013-05-22merge changes for 3.5.3-releaseOz Linden
2013-05-22CHUI-941 FIXED [CHUIBUG]Inline input is not available in 3.5.0maksymsproductengine
2013-05-22CHUI-967: fix display of % escapes in chatGilbert Gonzales
2013-05-21mergeBrad Payne (Vir Linden)
2013-05-20merge changes for 3.5.2-releaseOz Linden
2013-05-17CHUI-959 FIXED Resident picker allowed to open behind fui toolbarsmaksymsproductengine
2013-05-17mergemberezhnoy
2013-05-16CHUI-963 (Toggling chat fui button twice tears off nearby chat to lower left ↵mberezhnoy
corner also deletes other open conversations)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 15:36:30 +0000