summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-10-30STORM-1975 Changed timeout constants toJonathan Yap
ME_TYPING_TIMEOUT = 4.0 OTHER_TYPING_TIMEOUT = 9.0
2013-10-30Merge downstream code from viewer-bearsimon
2013-10-30Fix transplated codesimon
2013-10-30MAINT-3359 Don't check for LLGLSLShader::sNoFixedFunction as we don't want ↵Mnikolenko ProductEngine
to loose ui colours(depending on enabled/disabled basic shader).
2013-10-29- Updated role_constants to reflect new ban access power valueBaker Linden
2013-10-29- Fixed the allowed_by_all to use all 64 bitsBaker Linden
- Changed some text to be more clarifying and to remove temp strings.
2013-10-29STORM-1975 Convert old-style debugging lines to new-styleJonathan Yap
2013-10-29STORM-1975 IM windows occasionally report false typing status.Jonathan Yap
2013-10-29BUG-3968: do not wear an object when renaming in inventoryTonya Souther
2013-10-28Pull merge from lindenlab/viewer-fbcMerov Linden
2013-10-28ACME-1099 : Fix crash when getting the Facebook cap from a (potentially ↵Merov Linden
null) region
2013-10-28Automated merge with http://bitbucket.org/nat_linden/viewer-maint-3331Nat Goodspeed
2013-10-28MAINT-3343 FIXED Expand/Collapse message pan only on left click.Mnikolenko ProductEngine
2013-10-28MAINT-3343 FIXED Expand/Collapse message pan only on left click.Mnikolenko ProductEngine
2013-10-25SH-3419 Replace per-object time dilation factor with region-wideAndrew Meadows
Reviewed with Simon
2013-10-25Fix release merge issues (included upstream changes not yet in release from ↵Graham Linden
bear)
2013-10-25MAINT-3356 GPU Table update to support Retina MBP 'Intel Iris OpenGL Engine' ↵Graham Linden
driver id on Mavericks.
2013-10-25Merge 3.6.9 ShareStormGraham Linden
2013-10-25MAINT-3275 FIXED Send DND auto response even if session already exists.Mnikolenko ProductEngine
2013-10-24MAINT-3140 FIXED Set STATE_ERROR to show "Try again..." message, when other ↵Mnikolenko ProductEngine
user declines call
2013-10-23increment viewer version to 3.6.10Oz Linden
2013-10-23MAINT-3250 FIXED [TUI] Dragging on the Map does not working correctlymaksymsproductengine
2013-10-22MAINT-3331: On update, remove com.secondlife.indra.viewer.savedState.Nat Goodspeed
2013-10-21MAINT-3311 Add avatar_lad and avatar_skeleton changes from JeremiahDave Parks
2013-10-17Merge. Pull in viewer-release after 3.6.8 fixes for AMD graphics.Monty Brandenberg
2013-10-17Pull merge from oz_linden/336-snowstormMerov Linden
2013-10-16Fix merge error in llvoavatarGraham Linden
2013-10-16Merge 3.6.8Graham Linden
2013-10-16Merged 3.6.8-releaseScott Lawrence
2013-10-16Merged 3.6.8-releaseScott Lawrence
2013-10-16increment viewer version to 3.6.9oz@lindenlab.com
2013-10-15merge changes for DRTVWR-336Oz Linden
2013-10-11MAINT-2968 Transplant cleanup.Dave Parks
2013-10-10MAINT-2968 Fix for crash on AMD hardware running current drivers.Dave Parks
2013-10-10Quite down log spam from loading shaders.Dave Parks
Up bone cap to 64 for rigged meshes.
2013-10-09[GroupBan] Minor fixes / Code reviewBaker Linden
Reviewer: Richard Linden - Minor fixes from code review - Continue stubbing out ban_reason, or implement it (depending on how quickly I can do it, though stubbing out ban_reason will be sufficient, which it is now) - Fixed an issue where a ban list string in the actions tab wasn't showing up properly
2013-10-04Convert one more unit test over to improved waiting scheme to avoid build ↵Monty Brandenberg
failures.
2013-10-04Merge. Pull in viewer-release after 3.6.7 release.Monty Brandenberg
2013-10-04Pull merge of lindenlab/viewer-releaseMerov Linden
2013-10-03improve preference label for fly/jumpOz Linden
2013-10-03merge changes for 3.6.7-releaseOz Linden
2013-10-03increment viewer version to 3.6.8Oz Linden
2013-10-02Added check to ensure the group member has the ability to delete ban entriesBaker Linden
2013-10-02Enum typo, whoops!Baker Linden
2013-10-02Attempting fix for TC build issue.Baker Linden
2013-10-01Hand-merge of some viewer-release codeBaker Linden
2013-09-30Merge with voorhees (viewer-release)Baker Linden
2013-09-30MAINT-3193 FIXED crash with LLControlCache<bool>::LLControlCache: Control ↵MaximB ProductEngine
named RenderAutoMuteLoggingnot found.
2013-09-27Up the transfer timeout of small meshes to 120S. This matchesMonty Brandenberg
the change made for MAINT-2347. Large transfers are still 10 minutes. Add/update to-do list and add some more info to the FAQ in the Readme.
2013-09-26MAINT-3155 add cocoa equiv for former AppleEventManager shenanigans for ↵Graham Madarasz (Graham Linden)
SLURL handling