summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2015-10-20silly typo that builds on windows - this fixes mac/linux buildscallum_linden
2015-10-20Merge with tip of viewer-releasecallum_linden
2015-10-20MAINT-5711 FIX2 auto login for profiles - final part retrieves the URL to ↵callum_linden
set cookie for from the message sent over by login.cgi
2015-10-19MAINT-5711 FIX profiles and marketplace are asking for a login each sessioncallum_linden
2015-10-19MAINT-5732: Behavior #2. Be sure that the internet stream is stopped before ↵Rider Linden
destroying the streaming audio interface. Otherwise FMODEX blocks on close.
2015-10-19Merged lindenlab/viewer-lion into defaultRuslan Teliuk
2015-10-19MAINT-5268 FIXED Rotating an object that's used as grid reference goes crazyruslantproductengine
Patchset #2
2015-10-19MAINT-5742 FIXED Appearance window progress indicator spins after changing ↵Mnikolenko ProductEngine
to an identical outfit
2015-10-19MAINT-5268 FIXED Rotating an object that's used as grid reference goes crazyruslantproductengine
2015-10-19MAINT-5742 FIXED Appearance window progress indicator spins after changing ↵Mnikolenko ProductEngine
to an identical outfit
2015-10-19MAINT-5753 FIXED Viewer crashes when opening a texture from object contentsMnikolenko ProductEngine
2015-10-17Suppress specifically the LLProcess and LLLeap integration testsNat Goodspeed
because of Oz's suspicion that they may, in some mysterious way, contribute to code-signing failures.
2015-10-16MAINT-5271: Microsoft is just too permissive.rider
2015-10-16MAINT-5271: Converted internal pointers to internal operation to managed ↵Rider Linden
shared pointers. Removed direct cast and dereference of handles.
2015-10-16MAINT-5756: Unicode characters in online notifications get strippedAnsariel
2015-10-16MergeAndreyL ProductEngine
2015-10-16MAINT-933 FIXED [PUBLIC]Show Land Owner color overlay only visible where ↵Ruslan Teliuk
there is water when rendering of Lights and Shadows is active. MAINT-933 FIXED [PUBLIC]Show Land Owner color overlay only visible where there is water when rendering of Lights and Shadows is active.
2015-10-15Merge downstream code, version 3.8.6AndreyL ProductEngine
2015-10-15This file change should not have been checked in.Rider Linden
2015-10-15Another fix for unit tests. Missed on Windows.Rider Linden
2015-10-15MAINT-5732: Update unit testsRider Linden
2015-10-15MAINT-933 FIXED [PUBLIC]Show Land Owner color overlay only visible where ↵ruslantproductengine
there is water when rendering of Lights and Shadows is active. Patchset #2 Remove Debug code
2015-10-15MAINT-5732: Issue in texture_load example and some comments regarding ↵Rider Linden
NoOpDeletor
2015-10-15MAINT-5732: Fixes for Mac buildrider
2015-10-15MAINT-5738 FIXED If "Always Run" is enabled, camming is broken when sitting ↵Mnikolenko ProductEngine
down.
2015-10-15MAINT-925 FIXED Objects called "Second Life" are unclickable & unmuteable ↵Mnikolenko ProductEngine
via local chat
2015-10-14MAINT-5732: Change to the way event polling handles error conditions and ↵Rider Linden
cancel calls. Refactor any remaining LLCore::HTTPHandlers to use boost::shared_ptr Started minor refactor in the materials manager into coroutines (unfinished)
2015-10-19Merge from viewer release.Rider Linden
2015-10-14MAINT-933 FIXED [PUBLIC]Show Land Owner color overlay only visible where ↵ruslantproductengine
there is water when rendering of Lights and Shadows is active.
2015-10-13merge changes for MAINT-4734pavelkproductengine
2015-10-13merge changes for 3.8.5-releaseOz Linden
2015-10-13MAINT-5730 FIXED Text overlapping in group invites with non-default group roleMnikolenko ProductEngine
2015-10-12increment viewer version to 3.8.6Oz Linden
2015-10-12MAINT-5678 FIXED Materials with spaces in name import with truncated namesAndreyL ProductEngine
2015-10-09SL-230: Azumarill viewer was incorrectly swallowing upload errors returned ↵Rider Linden
from the server. Correctly report errors and use upload cost provided by server.
2015-10-09CMake fixes for mac build.rider
2015-10-09MAINT-5715, MAINT-5717, MAINT-5718: Replace the the volume catcher that was ↵Rider Linden
removed with the QT viewer. Addresses panning and fading issues, teleport and viewer mute controls.
2015-10-09Mergepavelkproductengine
2015-10-09Merge Xcode 7 Updatepavelkproductengine
2015-10-09MAINT-2251 FIXED Changed min. heightMnikolenko ProductEngine
2015-10-08Mergerider
2015-10-08MAINT-5708 FIXED Images shouldn't be displayed in notification titlesMnikolenko ProductEngine
2015-10-07MAINT-5691: Browser was using deprecated outbox display type AND not ↵Rider Linden
correctly returning error body to application. LLCore:HTTP now will provide and LLSD translation of the message body when possible in the case of an error HTTP result VMM alert boxes now use type="alertmodal" rather than "outbox"
2015-10-07A small tweak when SLVoice is not runningBjoseph Wombat
2015-10-07MAINT-3568 Mac OS X, ALM, Full Bright, ShininessRuslan Teliuk
In past, I already fixed the similar problem (MAINT-4165, MAINT-4839), and than I created the code for guarantee it in LLGLSLShader::mapUniforms() with explanation in comment why it's need. For this ticket the problem the same, on OSX platform for shader:(class1/deferred/fullbrightShinyF.glsl) the uniform: environmentMap has lower location than diffuseMap. And here is the problem appear when we try bind 2D texture instead Cube texture and vice versa.
2015-10-06MAINT-5703 fix - add observer to media plugin so MEDIA_LOCATION_CHANGED ↵callum_linden
events get propagated throughout system
2015-10-06Mergerider
2015-10-06MAINT-5693: Corrected error on Linux & Mac, force LLSD to string.Rider Linden
2015-10-06merged changes from viewer-xcode-7Bjoseph Wombat
2015-10-06MAINT-5693: Consolidated the avatar appearance request into a coroutine. If ↵Rider Linden
the request fails because of a stale COF, then rerequest with the corrected one.