summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-11-19merge changes for DRTVWR-245Oz Linden
2012-11-19tag merge of DRTVWR-245Oz Linden
2012-11-19Added tag DRTVWR-232 for changeset f1d3b3fcab28Oz Linden
2012-11-19CHUI-488 ADD. fIX Clean up codeAlexanderP ProductEngine
2012-11-19CHUI-487 ADD. FIX (Revised comments)AlexanderP ProductEngine
2012-11-19CHUI-434 (Don't display phone icon and disable phone button when voice isn't ↵MaximB ProductEngine
enabled)
2012-11-19 CHUI-423 (User typing /me something in chat does not show correctly in ↵MaximB ProductEngine
italics on outgoing or incoming chat)
2012-11-17Merge pull from richard/viewer-chuiMerov Linden
2012-11-17CHUI-479 : Clean up unecessary tracking codeMerov Linden
2012-11-17Update to Boost 1.52 package with gcc 4.1 warning fix.Nat Goodspeed
2012-11-16CHUI-479 : Fixed : Rebuild the root on the LLFloaterIMSession when modifying ↵Merov Linden
the session ID
2012-11-16merging in latest changesGilbert Gonzales
2012-11-16CHUI-529: Now the conversations floater will appear when the chat preference ↵Gilbert Gonzales
is set for friend, non-friend, conference, group and nearby chat.
2012-11-16MAINT-1890 FIX Removing previous hacky fix for this issue. The better ↵William Todd Stinson
solution is to clamp the update_period to a reasonable number of frames (32).
2012-11-16CHUI-518: FIX Removing the LLIMMgr::getInstance() as the containing method ↵William Todd Stinson
is already a non-static member method of the same class.
2012-11-16Some Mac header #defines macros like check and equivalent -- gack!!Nat Goodspeed
Given that third-party libraries (such as Boost) can and do use those names, properly namespace-scoped, it's unpardonable to break any such innocent usage with a macro. Given the pervasiveness of the need, introduce a header file with the requisite #undef directives.
2012-11-16Certain test and example programs now need the Boost.System library.Nat Goodspeed
2012-11-16Boost 1.52 no longer supports Boost.Filesystem v2 -- don't request.Nat Goodspeed
Instead of compatibility mode, #defining BOOST_FILESYSTEM_VERSION to 2 only gets you a compile error these days.
2012-11-16Remove sensitivity to Boost library versions in viewer_manifest.py.Nat Goodspeed
2012-11-16Fix Boost shared-library version suffixes in Copy3rdPartyLibs.cmake.Nat Goodspeed
2012-11-16CHUI-487, CHUI-488 FIXED (Enable flashing FUI button behavior and Implement ↵AlexanderP ProductEngine
Flashing Conversations panel line item behavior): implemented FUI button flashing; clean up code
2012-11-16Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.William Todd Stinson
2012-11-16CHUI-479 : WIP : Tracing of LLIMModel::processSessionInitializedReply (to be ↵Merov Linden
deleted).
2012-11-16merging in latest changesGilbert Gonzales
2012-11-16Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-11-16Use new 3p-boost 1.52 build with Windows /Zc:wchar_t- compile switch.Nat Goodspeed
2012-11-16CHUI-487, CHUI-488 W.I.P. #3 (Enable flashing FUI button behavior and ↵AlexanderP ProductEngine
Implement Flashing Conversations panel line item behavior): implemented conversation's item flashing
2012-11-15CHUI-489: Code review cleanup for both CHUI-489 and CHUI-486. This should be ↵Gilbert Gonzales
last commit for CHUI-489.
2012-11-15CHUI-518: WIP First pass as implementing auto-reject voice calls in do not ↵William Todd Stinson
disturb mode.
2012-11-15Remove Boost version "1_45" baked into library names.Nat Goodspeed
On Windows, LLPrimitive.cmake named four Boost libraries with names ending in the string 1_45. Now that we're trying to upgrade Boost to 1.52, those suffixes are inappropriate. Fortunately the libraries in our current Boost package do not have version-stamped names, so we hope this fix can survive for several Boost upgrades to come.
2012-11-15CHUI-479 : WIP : Introduce a publicly available ↵Merov Linden
LLSpeakingIndicatorManager::updateSpeakingIndicators() method so to reset all indicators when creating new dialogs.
2012-11-15CHUI-489: Found a bug in last commit for this issue. The sound notification ↵Gilbert Gonzales
(for inventory/teleport offer) would be played for the toast popup as well as once the conversations floater was opened. And also when a button was clicked in the conversation floater to 'accept' or 'deny' the offer. Now only playing the sound notification when the initial offer has been made.
2012-11-15merging in latest changesGilbert Gonzales
2012-11-15CHUI-489: Now sounds exist for teleport and inventory offers. The sound is ↵Gilbert Gonzales
specified in notifications.xml. Also changes for CHUI 486, which allow the user to set preferences for hearing sounds for a New Conversation, Incoming Voice Call, Teleport Offer and Inventory Offer.
2012-11-15CHUI-524: The root reason of crash was in the infinity recursion in the ↵maksymsproductengine
chain of calls LLFloater::setFocus->LLFloater::setFrontmost->LLFloaterView::bringToFront. And problem was not related to CHUI-362. Reviewed by Stinson.
2012-11-15Backed out changeset: 80bab29003f8 Removing hack fix for CHUI-524.William Todd Stinson
2012-11-15CHUI-442 FIXED Nearby chat does not open conversations floater when clicking ↵maksymsproductengine
first nearby chat toast in a session
2012-11-16CHUI-525 FIXED Tootlips are added for Info buttonsmaxim_productengine
2012-11-15CHUI-524: FIX Removing a function call that results in a circular logic loop ↵William Todd Stinson
and an eventual stack overflow crash.
2012-11-15merging into latest changesMaximB ProductEngine
2012-11-15correct attribution for STORM-1868 (add Wolf Loonie)Oz Linden
2012-11-15CHUI-487, CHUI-488 W.I.P. #2 (Enable flashing FUI button behavior and ↵AlexanderP ProductEngine
Implement Flashing Conversations panel line item behavior): build new class LLFlashTimer based on LLSysWellChiclet::FlashToLitTimer; prepared it for general purpose; replaced LLSysWellChiclet::FlashToLitTimer to LLFlashTimer
2012-11-15CHUI-397 (Delay in removing names from participant list in nearby chat)MaximB ProductEngine
CHUI-440 (Nearby chat participant list does not clear after teleport when conversation floater is closed/minimized) fixed
2012-11-14CHUI-479 : WIP : More tracingMerov Linden
2012-11-14tag merge of DRTVWR-241Oz Linden
2012-11-14DRTVWR-241: resolve merge conflict with viewer-development.Nat Goodspeed
LLUI::setupPaths() went away with DRTVWR-210.
2012-11-14CHUI-487, CHUI-488 W.I.P. #1 (Enable flashing FUI button behavior and ↵AlexanderP ProductEngine
Implement Flashing Conversations panel line item behavior): build new class LLFlashTimer based on LLSysWellChiclet::FlashToLitTimer; prepared it for general purpose; replaced LLSysWellChiclet::FlashToLitTimer to LLFlashTimer
2012-11-14Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-11-14MergeMerov Linden
2012-11-14CHUI-479 : WIP : Add debug tracing into speaking indicator manager and ↵Merov Linden
monitors (to be deleted eventually).