summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2016-07-15SL-126 - getting performance analysis into a non-crashing stateBrad Payne (Vir Linden)
2016-07-14merge changes for STORM-2133Oz Linden
2016-07-14MAINT-5011: Per NickyD, make LLCertException::getMessage() const.Nat Goodspeed
Also getCert(). Also LLProtectedDataException::getMessage().
2016-07-14MAINT-5011: Per NickyD, put PngError in anonymous namespace.Nat Goodspeed
2016-07-14MAINT-5011: On advice from NickyD, say KDUError not KduError.Nat Goodspeed
Also place KDUError into anonymous namespace to emphasize that it's entirely local to this .cpp file.
2016-07-14MAINT-6460 Crash calculating mesh complexityandreykproductengine
2016-07-14STORM-2133: VOICE-36 prevents proper shutdown of connectorAnsariel
2016-07-13MAINT-5011: Throw an actual exception in Force Software Exception.Nat Goodspeed
http://en.cppreference.com/w/cpp/language/throw says of the plain throw syntax: "This form is only allowed when an exception is presently being handled (it calls std::terminate if used otherwise)." On advice from Oz, replace plain 'throw;' with throwing a std::runtime_error.
2016-07-13MAINT-5011: Introduce KduError instead of throw/catch const char*.Nat Goodspeed
KduError is derived from std::runtime_error, so the message string becomes its what() message.
2016-07-13MAINT-5011: Remove alarming ll_kdu_error() functionNat Goodspeed
whose body reads: // *FIX: This exception is bad, bad, bad. It gets thrown from a // destructor which can lead to immediate program termination! throw "ll_kdu_error() throwing an exception"; which would be bad indeed... if ll_kdu_error() were ever actually referenced by anything!
2016-07-13MAINT-5011: Wrap thrown png_const_charp in new PngError classNat Goodspeed
derived from std::runtime_error.
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-12mergeBrad Payne (Vir Linden)
2016-07-12SL-424 - slider eye fixes, tail scaling with heightBrad Payne (Vir Linden)
2016-07-12MAINT-6460 Crash calculating mesh complexityandreykproductengine
2016-07-12MergeRider Linden
2016-07-12STORM-2132: Remove obsoleted unique_ptr.hpp, use make_shared for pointer ↵Rider Linden
allocation.
2016-07-12SL-242 - eyelid slider fixBrad Payne (Vir Linden)
2016-07-12update default LSL hints file to match the server versionOz Linden
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-11SL-242 - avatar_lad.xml syntax fix, added missing scale params to some ↵Brad Payne (Vir Linden)
skeletal distortions.
2016-07-11SL-242 - more tweaks around alt eyes and wings. Alt eyes are now parented to ↵Brad Payne (Vir Linden)
face root, and alt eyes animate along with the original eyes inside the LLHeadRotMotion code.
2016-07-11MAINT-6534 Resetting scripts via the build menu no longer works on many ↵andreykproductengine
scripted objects
2016-07-08SL-242 - fix for slider param groups, added default args for skel_tool.pyBrad Payne (Vir Linden)
2016-07-08SL-242 - additional fixes for egghead sliderBrad Payne (Vir Linden)
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-06mergeBrad Payne (Vir Linden)
2016-07-06SL-424 - more proposed skeleton/slider fixesBrad Payne (Vir Linden)
2016-07-06mergeBrad Payne (Vir Linden)
2016-07-07Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2016-07-06increment viewer version to 4.0.7Oz Linden
2016-07-05SL-109 - little bit of log spam cleanupBrad Payne (Vir Linden)
2016-07-05SL-402 - update mBodySize more frequently to avoid inconsistent vertical ↵Brad Payne (Vir Linden)
positioning of avatar.
2016-07-01MAINT-6481 FIX Media controls not presentcallum_linden
2016-07-01SL-402 - more avatar height tracing in debug textBrad Payne (Vir 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-29SL-426 - strings.xml fix for pec attachments, SL-402 - diagnostics for ↵Brad Payne (Vir Linden)
investigation
2016-06-28Fixed up broken XML for Web Content Browser test video URL buttonscallum_linden
2016-06-27SL-124 - code cleanupBrad Payne (Vir Linden)
2016-06-25SL-344 - fixes for scaling of mEye and mAltEye bonesBrad Payne (Vir Linden)
2016-06-24SL-124 - comment cleanup, fixed a crash if skinned mesh has no valid joint ↵Brad Payne (Vir Linden)
names defined
2016-06-24SL-344 - additional slider updates, including scaling of mEye bonesBrad Payne (Vir Linden)