summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2016-07-18MAINT-6520 Add a way to see worn temp attachments.Mnikolenko Productengine
2016-07-14MAINT-6559 Fixed a constant in Mesh Streaming calculationAndreyL ProductEngine
2016-07-13Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2016-07-13MAINT-5011: Derive remaining exception classes from std::exception.Nat Goodspeed
In particular: NotImplemented in llhttpnode.cpp RelocateError in llupdateinstaller.cpp LLProtectedDataException, LLCertException and subclasses in llsecapi.h Had to add no-throw destructor overrides to LLCertException and subclasses because otherwise clang complains that the implicitly-generated destructor's exception specification is more lax than the base class's.
2016-07-13Merged in lindenlab/viewer-lynxAndreyL ProductEngine
2016-07-12MergeRider Linden
2016-07-12MAINT-6460 Crash calculating mesh complexityandreykproductengine
2016-07-12STORM-2132: Remove obsoleted unique_ptr.hpp, use make_shared for pointer ↵Rider Linden
allocation.
2016-07-12line endings fixandreykproductengine
2016-07-11MAINT-6527 and MAINT-6528 FIX - max volume and media playing prior URLsCallum Prentice
2016-07-11MAINT-6565: Grab a shared pointer and encapsulate it into the bind call in ↵Rider Linden
place of this. Ensures that the impl is not deleted while the coroutine is active.
2016-07-11MAINT-6534 Resetting scripts via the build menu no longer works on many ↵andreykproductengine
scripted objects
2016-07-08Merged in lindenlab/viewer-releasepavelkproductengine
2016-07-08MAINT-6448 PERMISSION_DEBIT notification should default to Denyandreykproductengine
2016-07-08MAINT-6534 Fixed the LLSD validation failureAndreyL ProductEngine
2016-07-07MAINT-6476 FIXED VOB - User can add any size image to an Outfit Gallery ↵pavelkproductengine
outfit folders Eliminated overuse of texture memory
2016-07-07Automated merge with tip of viewer-releasecallum_linden
2016-07-07MAINT-6527 FIX -volume plays at full amount +50m away - volume was not set ↵callum_linden
for media outside attenuation zone so played at random value
2016-07-07Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2016-07-06increment viewer version to 4.0.7Oz Linden
2016-07-05MAINT-5388 File "conversation.log" created in users' root directory on Windowsandreykproductengine
2016-07-06MAINT-4066 Missing notificationsandreykproductengine
2016-07-07MAINT-6552 One more nullcheckAndreyL ProductEngine
2016-07-07Merged in lindenlab/viewer-lynxAndreyL ProductEngine
2016-07-06MAINT-6552 Contribution: Viewer sometimes crashes when opening oversized ↵AndreyL ProductEngine
textures
2016-07-05MAINT-6550 Graphic preset name including "\" causes preset to be unusable & ↵Mnikolenko Productengine
preset cannot be deleted.
2016-07-04MAINT-6259 rigged items' LOD should be size dependent, not only avatar dependentandreykproductengine
2016-07-01MAINT-6481 FIX Media controls not presentcallum_linden
2016-06-30DRTVWR-418: Unify control flow through LLAppViewer across platforms.Nat Goodspeed
The LLApp API used to consist of init(), mainLoop(), cleanup() methods. This makes sense -- but on Mac that structure was being subverted. The method called mainLoop() was in fact being called once per frame. There was initialization code in the method, which (on Mac) needed to be skipped with an already-initialized bool. There was a 'while' loop which (on Mac) needed to be turned into an 'if' instead so the method would return after every frame. Rename LLApp::mainLoop() to frame(). Propagate through subclasses LLAppViewer and LLCrashLogger. Document the fact that frame() returns true to mean "done." (This was always the case, but had to be inferred from the code.) Rename the Mac Objective-C function mainLoop to oneFrame. Rename the C++ free function it calls from runMainLoop() to pumpMainLoop(). Add comments to llappdelegate-objc.mm explaining (inferred) control flow. Change the Linux viewer main() and the Windows viewer WINMAIN() from a single LLAppViewer::mainLoop() call to repeatedly call frame() until it returns true. Move initialization code from the top of LLAppViewer::frame() to the init() method, where it more properly belongs. Remove corresponding mMainLoopInitialized flag (and all references) from LLAppViewer. Remove 'while (! LLApp::isExiting())' (or on Mac, 'if (! LLApp::isExiting())') from LLAppViewer::frame() -- thus unindenting the whole body of the 'while' and causing many lines of apparent change. (Apologies to reviewers.) There are four LLApp states: APP_STATUS_RUNNING, APP_STATUS_QUITTING, APP_STATUS_STOPPED and APP_STATUS_ERROR. Change LLAppViewer::frame() return value from (isExiting()) (QUITTING or ERROR) to (! isRunning()). I do not know under what circumstances the state might transition to STOPPED during a frame() call, but I'm quite sure that if it does, we don't want to call frame() again. We only want a subsequent call if the state is RUNNING. Also rename mainLoop() method in LLCrashLogger subclasses LLCrashLoggerWindows, LLCrashLoggerMac, LLCrashLoggerLinux. Of course it's completely up to the frame() method whether to yield control; none of those in fact do. Honor protocol by returning true (frame() is done), even though each one's main() caller ignores the return value. In fact LLCrashLoggerWindows::mainLoop() wasn't using the return protocol correctly anyway, returning wParam or 0 or 1 -- possibly because the return protocol was never explicitly documented. It should always return true: "I'm done, don't call me again."
2016-06-29merge changes for buildscriptsOz Linden
2016-06-29MAINT-2141 Sky Cloud Coverage reverts to 0.27 when toggling view back to ↵andreykproductengine
region sky
2016-06-28Fixed up broken XML for Web Content Browser test video URL buttonscallum_linden
2016-06-27MAINT-6518 allow negative numbered chat channelsandreykproductengine
2016-06-24MAINT-6487 After editing an object with a large number of contents, contents ↵andreykproductengine
in any object will not load until relog.
2016-06-24Merged in rider_linden/viewer-bear (pull request #13)Andrey Lihatskiy
MAINT-6521: A compare against a static const empty string causes segfault in integration tests on Mac and Linux.
2016-06-24MergeRider Linden
2016-06-24MAINT-6521: A compare against a static const empty string causes segfault in ↵Rider Linden
integration tests on Mac and Linux. Use empty() test instead.
2016-06-24Merged in lindenlab/viewer-bearAndreyL ProductEngine
2016-06-23MergeRider Linden
2016-06-23MAINT-6521: Allow anonymous connections to bypass the dependency and order ↵Rider Linden
tracking.
2016-06-23MAINT-6516 FIXED Crash in updateEditFieldValues() while in Pathfinding -> ↵Mnikolenko Productengine
Linksets floater
2016-06-22MergeRider Linden
2016-06-22MAINT-6385: Ensure that VMM initialization only happens once after login and ↵Rider Linden
that it will only happen after the region caps have been received.
2016-06-22Merged in lindenlab/viewer-lynxAndreyL ProductEngine
2016-06-22MAINT-6515 Viewer doesn't store scripted null string settext updates for ↵andreykproductengine
Metadata close refreshing.
2016-06-22MAINT-1768 Allow sharing objects from trash folderMnikolenko Productengine
2016-06-22MAINT-6514 Appearance Mode Body Parts Select shows wrong typeandreykproductengine
2016-06-21MAINT-6513 Math rounding errorsandreykproductengine
2016-06-17remove deliberate syntax errorOz Linden
2016-06-17deliberate syntax errorOz Linden