summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-10-27Merge downstream, version 3.8.7AndreyL ProductEngine
2015-10-26Merge with head of this branch after viewer-releasecallum_linden
2015-10-26Merge with head of viewer release (3.8.6 changes)callum_linden
2015-10-26increment viewer version to 3.8.7Oz Linden
2015-10-26Added tag 3.8.6-release for changeset 5a5bd148943bOz Linden
2015-10-26MergeAndreyL ProductEngine
2015-10-26Merged viewer-xcode-7AndreyL ProductEngine
2015-10-26MAINT-5760 Save favorite landmarks after renamingMnikolenko ProductEngine
2015-10-23Merged lindenlab/viewer-lion into defaultRuslan Teliuk
2015-10-23MAINT-5464 FIXED Do not add badge to links that have a port number specified.AndreyL ProductEngine
2015-10-22Pull in LLCEFLib changes for OS X cookies (partial) and local web storage quotasCallum Prentice
2015-10-22MAINT-5775 FIX Split out cookies and cache directories into separate folders ↵callum_linden
and move cache to same place as viewer cache
2015-10-21Fix windows line endingscallum_linden
2015-10-21MAINT-4360 FIXED (Setting LogTextureDownloadsToSimulator causes a viewer crash)ruslantproductengine
The fix in fllowing: LLTextureFetch has object LLTextureInfo which is has Recorder object. The recorder object activate (Recorder::handleStart()) self AccumulatorBufferGroup (Recorder::mBuffers into the current (LLTrace::get_thread_recorder()) ThreadRecorder object which created (as I understand) one per thread, and time to time send accumulated data to the master ThreadRecorder. The problem is that LLTextureFetch also can uses from the main thread. I decide add parameter to CTOR LLTextureInfo(bool postponeStartRecoreder) - if it false the recorder start immediatly in LLTextureInfo CTOR body, if true we need to start it manually. Also I add another one LLTextureInfo in LLTextureFetch::mTextureInfoMainThread which is intended for accumulate data from the main thread. The postponed Recorder started/stoped from LLTextureFetch::startThread()/endThread().
2015-10-21MAINT-4360 FIXED (Setting LogTextureDownloadsToSimulator causes a viewer crash)ruslantproductengine
The fix in fllowing: LLTextureFetch has object LLTextureInfo which is has Recorder object. The recorder object activate (Recorder::handleStart()) self AccumulatorBufferGroup (Recorder::mBuffers into the current (LLTrace::get_thread_recorder()) ThreadRecorder object which created (as I understand) one per thread, and time to time send accumulated data to the master ThreadRecorder. The problem is that LLTextureFetch also can uses from the main thread. I decide add parameter to CTOR LLTextureInfo(bool postponeStartRecoreder) - if it false the recorder start immediatly in LLTextureInfo CTOR body, if true we need to start it manually. Also I add another one LLTextureInfo in LLTextureFetch::mTextureInfoMainThread which is intended for accumulate data from the main thread. The postponed Recorder started/stoped from LLTextureFetch::startThread()/endThread().
2015-10-21MAINT-5759 FIXED URL links in the UI with non-English characters, ↵Mnikolenko ProductEngine
diacritics, don't get parsed correctly.
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-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-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-16Merge with developAndreyL ProductEngine
2015-10-16Close branch developAndreyL ProductEngine
--HG-- branch : develop
2015-10-15Merge downstream code, version 3.8.6AndreyL ProductEngine
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-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-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-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-12Added tag 3.8.5-release for changeset e821ef17c6edOz Linden
2015-10-12MAINT-5678 FIXED Materials with spaces in name import with truncated namesAndreyL ProductEngine
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-08MAINT-5708 FIXED Images shouldn't be displayed in notification titlesMnikolenko ProductEngine
2015-10-07Point to new version of LLCEFLib that doesn't crash on OS Xcallum_linden
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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 06:17:14 +0000