summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2015-10-27MergeRider Linden
2015-10-27Pulled merge from bento prime.Aura Linden
2015-10-27MAINT-5754: For MoaP and MediaCtrls forward all events including KEYUP and ↵Rider Linden
KEYDOWN to the CEF plugin.
2015-10-27Fixes SL-202 joint offset and skin weight import. Race condition still exists.Aura Linden
2015-10-27MAINT-3491 FIXED If ALM is enabled while in wireframe mode, disabling ↵ruslantproductengine
wireframe mode results in a black screen.
2015-10-27Merged lindenlab/viewer-lion into defaultRuslan Teliuk
2015-10-27Merged lindenlab/viewer-lion into defaultAndrey Lihatskiy
2015-10-27MAINT-5758 FIXED "Ban Member" from the group chatters list context menuAndreyL ProductEngine
is greyed out once you have performed a ban, until you load the group members list from group info.
2015-10-27MAINT-5760 FIXED Favorites sort order reverts every session and no favorites ↵Mnikolenko ProductEngine
display at the login screen for single name "Resident" accounts.
2015-10-27Merge downstream, version 3.8.7AndreyL ProductEngine
2015-10-26mergeBrad Payne (Vir 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-26SL-113: merge up to bento trunkGlenn Glazer
2015-10-26SL-113: use product approved message stringGlenn Glazer
2015-10-26MAINT-5760 Save favorite landmarks after renamingMnikolenko ProductEngine
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-22SL-234 WIP - fix for enforcement of MaxJointsPerMeshObject limitBrad Payne (Vir Linden)
2015-10-21SL-234 WIP - TC build fixesBrad Payne (Vir Linden)
2015-10-21SL-234 WIP - moved LLSkinningUtil funcs to separate class/files. Remap ↵Brad Payne (Vir Linden)
weights where needed. Warn that related debug settings require restart to take effect.
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-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-20SL-113: viewer message from simulator on illegal attachment pointGlenn Glazer
2015-10-19MAINT-5711 FIX profiles and marketplace are asking for a login each sessioncallum_linden
2015-10-19SL-234 WIP - remap skin weights to match included-joint logicBrad Payne (Vir 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-16SL-234 WIP - Track which joints are part of base skeleton, remap non-base ↵Brad Payne (Vir Linden)
ones when not being rendered.
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-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-12mergeBrad Payne (Vir Linden)
2015-10-12increment viewer version to 3.8.6Oz Linden
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-07SL-234 WIP - mac build fixBrad Payne (Vir Linden)
2015-10-07SL-234 WIP - adjust max mesh object joints at run-time, including rebuilding ↵Brad Payne (Vir Linden)
shaders
2015-10-06SL-225: test with joints per mesh set to 132Glenn Glazer