summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
AgeCommit message (Collapse)Author
2013-12-02merge with releaseRichard Linden
2013-11-22fix for SH-4632: Water over land doesn't render when teleporting to the same ↵Xiaohong Bao
place twice with location toolbar
2013-11-11Automated merge with http://bitbucket.org/lindenlab/viewer-releaseRichard Linden
2013-11-11Merge 3.6.11 for RC-abilityGraham Linden
2013-11-06fixed some warningsRichard Linden
2013-11-06merge with releaseRichard Linden
2013-10-25Fix release merge issues (included upstream changes not yet in release from ↵Graham Linden
bear)
2013-10-25Merge 3.6.9 ShareStormGraham Linden
2013-10-15renamed TimeBlock to BlockTimerStatHandleRichard Linden
2013-10-15merge changes for DRTVWR-336Oz Linden
2013-10-08merge from viewer-releaseRichard Linden
2013-09-16MAINT-3018 (Remove long distracting messages appearing in nearby chat)MaximB ProductEngine
2013-09-13fix for SH-4494: interesting: deleted objects reappearXiaohong Bao
2013-09-09merge with viewer-releaseRichard Linden
2013-09-09Merge downstream code with viewer-releasesimon_linden
2013-09-09MAINT-3048 FIXED Show actual message instead of "Only friends and groups can ↵maxim@mnikolenko
call..." for Lindens.
2013-09-05changed fast timer over to using macroRichard Linden
another attempt to move mem stat into base class
2013-08-26removed some unecessary template parameters from LLUnit member functionsRichard Linden
forced unit conversion code to inline unit conversion now no longer converts all the way to base and back, but tries to find equivalent units as early as possible fixed another llinfos instance scene monitor now outputs n/a for invalid samples
2013-08-26Merge downstream code from CHUIStorm releasesimon
2013-08-26merge changes for 3.6.4-releaseOz Linden
2013-08-23MAINT-2575 FIXED Resident can accept unlimited number of friendship requests ↵maksymsproductengine
if they were sent before his first accept
2013-08-20merge changes for 3.6.3-releaseOz Linden
2013-08-19Automated merge with http://bitbucket.org/lindenlab/viewer-interestingXiaohong Bao
2013-08-19MergeXiaohong Bao
2013-08-19merge changes for DRTVWR-285Oz Linden
2013-08-19merge changes for 3.6.3-releaseOz Linden
2013-08-18SH-4433 WIP: Interesting: Statistics > Ping Sim is always 0 msRichard Linden
continued conversion to units system made units perform type promotion correctly and preserve type in arithmetic e.g. can now do LLVector3 in units added typedefs for remaining common unit types, including implicits
2013-08-15moved unit types out of LLUnits namespace, since they are prefixedRichard Linden
2013-10-23Merge latest viewer-release with FBCsimon
2013-08-09second phase summer cleaningRichard Linden
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-07-30Summer cleaning - removed a lot of llcommon dependencies to speed up build timesRichard Linden
consolidated most indra-specific constants in llcommon under indra_constants.h fixed issues with operations on mixed unit types (implicit and explicit) made LL_INFOS() style macros variadic in order to subsume other logging methods such as ll_infos added optional tag output to error recorders
2013-07-24SH-4376 FIX: Interesting: in Statistics, replace the text "0" with "n/a" whenRichard Linden
there are no samples during the time period. added hasValue to SampleAccumulator so we don't print a value when we don't have a single sample yet added some disabled log output for scene load timing
2013-06-27Merged lindenlab/viewer-release into defaultCinder Roxley
2013-07-19CHUI-985 POSTPONED [CHUIBUG]User receives three friendship offer ↵maksymsproductengine
notifications simultaneously when he accept/decline friendship offer
2013-06-20merge with releaseRichard Linden
2013-06-13SH-3931 WIP Interesting: Add graphs to visualize scene load metricsRichard Linden
changed Units macros and argument order to make it more clear optimized units for integer types fixed merging of periodicrecordings...should eliminate duplicate entries in sceneloadmonitor history
2013-06-13merge changes for 3.5.3-releaseOz Linden
2013-06-05merge with viewer-releaseRichard Linden
2013-05-31revert changes for SH-3927: Interesting: Viewer should send predicted camera ↵Xiaohong Bao
position to simulator to control object load order
2013-05-22Pull merge from viewer-releaseMerov Linden
2013-05-21MAINT-2676 - Set home to here - screen_home.bmp not saved. Reviewed by Kelly.simon
2013-05-15CHUI-945 FIXED Add Object IMs to Chat Notification PreferencesPavelK ProductEngine
2013-05-13STORM-1948 - Fix for Set home to here - screen_home.bmp not savedCinders
2013-05-09Merge downstream code and viewer-betasimon
2013-05-09Merge viewer-betasimon
2013-05-03MAINT-2655: "Block button in permissions dialog prompt does not block object"Kelly Washington
* Fix mute button.
2013-05-03MAINT-2646 Viewer should neither grant nor display prompts for unimplemented ↵Kelly Washington
LSL permissions * Switch mute to use task id. reviewed with Simon
2013-05-03MAINT-2646 Viewer should neither grant nor display prompts for unimplemented ↵Kelly Washington
LSL permissions * Change text of dialog * Add callback for mute button reviewed with Richard and Widely.
2013-05-02Pull from viewer-releaseMerov Linden
2013-04-30MAINT-2646 Viewer should neither grant nor display prompts for unimplemented ↵Kelly Washington
LSL permissions * Add the newer run time permissions to the viewer * Filter requested permissions by those the viewer knows about * Show a dialog indicating unknown permissions were requested and a new viewer will be needed to grant them. reviewed with Simon and Soft