summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
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.
2015-10-06A small state machine change to wait until the media update event has ↵Bjoseph Wombat
arrived when leaving a region channel and before joining a p2p channel
2015-10-06MAINT-5694 FIXED Links on the 1st line of a group notice message are ↵Mnikolenko ProductEngine
sometimes not clickable.
2015-10-05MAINT-1390 FIXED Top colliders floater reopens itself if it was closed at ↵Mnikolenko ProductEngine
once after opening
2015-10-02MAINT-5687: Further purge QT and webkit from the build.Rider Linden
2015-10-02MAINT-5687: Remove old webkit from the make files and the repo. Ensure that ↵Rider Linden
it is no longer meaningfully referenced.
2015-10-02MAINT-3568 Mac OS X, ALM, Full Bright, Shininessruslantproductengine
The reason of this bug the same as was in MAINT-4165, MAINT-4839. I.e. in short: SL engine is sensitive to the uniform variable location.
2015-10-02MAINT-1459 For Sale accordion overlaps Estate accordion in Place Profile panelMnikolenko ProductEngine
2015-10-01Merge for Xcode 7rider
2015-10-01Fix OS X missing scope qualifierscallum_linden
2015-10-01merge changes for 3.8.4-releaseOz Linden
2015-09-30Update CEF media plugin to reflect changes in LLCEFLibcallum_linden
2015-09-30Merge from viewer releaseandreykproductengine
2015-09-30MAINT-5670 FIXED <icon> should not be parsed in expandable textboxesMnikolenko ProductEngine
2015-09-29Just remove the display_startup() calls.Rider Linden
2015-09-29MAINT-5614: Cancel the fade timer for the progress screen when hidding progress.Rider Linden
2015-09-30Merge downstream code, version 3.8.5AndreyL ProductEngine
2015-09-30Merge downstream code, version 3.8.5AndreyL ProductEngine
2015-09-29DRTVWR-409: merge DRTVWR-368Rider Linden
2015-09-29SL-229 (fix) update viewer version number to 4.0.0callum_linden
2015-09-29Merge with viewer-xcode-7 for Xcode 7 patchescallum_linden
2015-09-29Merge with viewer-release (DRTVWR-368)callum_linden
2015-09-29increment viewer version to 3.8.5Oz Linden
2015-09-29Mark MaxFPS as an unused settingOz Linden
2015-09-28MAINT-5676: Cleaned up the way we were keeping track of outstanding object ↵Rider Linden
cost requests. MAINT-5626: Fixed a typo/transcription error/fat finger mistake where I was missing the report of the land impact of selected objects.
2015-09-26Point to new third party llcef package and fix typo in interfacecallum_linden
2015-09-25There seemed to be an excess call to setInitialPerms, also cleaned up a ↵Rider Linden
ignored call to the environtment settings on login.
2015-09-25MAINT-51 FIXED Default parcel image for parcel without image is loaded in ↵Mnikolenko ProductEngine
Place profile after second click on 'I' information icon only
2015-09-24MAINT-5282: I've removed most of the depricated Merchant Outbox code and the ↵Rider Linden
links to it in the menus. Also removed the Outbox Floater and made the folder always hidden if empty in inventory. (There may still be some outstanding Outbox code that was not obvious that I have missed.)
2015-09-24MAINT-5614: Put the sInstance back the way it was for llpanelloginRider Linden
2015-09-24MAINT-5614: There are an obscene number of calls to "display_startup()" in ↵Rider Linden
the show login state. Try removing some of them.
2015-09-23Remove ares dependency from build.Rider Linden
2015-09-22Reuse old login panel...Rider Linden
2015-09-22replace the display_startup() removal that didn't work. Try backing up a ↵Rider Linden
step in the signon processing.
2015-09-22Test disabling a couple of the display_startup() calls as an experiment.Rider Linden
2015-09-22Merged in maint-5416 (pull request #2)Andrey Lihatskiy
MAINT-5416 FIXED Cannot right-click a rigged mesh that's worn