summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-05-24MergeDave SIMmONs
2011-05-24Added tag DRTVWR-54_2.6.8-release, 2.6.8-release for changeset be2000b946f8Debi King (Dessie)
2011-05-24mergeDave Parks
2011-05-24SH-469 GL_ARB_texture_multisample supportDave Parks
2011-05-24mergeBrad Payne (Vir Linden)
2011-05-24separating meshes from instancesBrad Payne (Vir Linden)
2011-05-24Merge latest from lindenlab/viewer-developmentDave SIMmONs
2011-05-24ER-914: Disable Parcel Privacy UI in viewer if on older simDave SIMmONs
2011-05-24Automated merge with ssh://hg.lindenlab.com/richard/viewer-experienceRichard Linden
2011-05-24STORM-1256 WIP Re-request region settings if our attempt to change them has ↵Vadim ProductEngine
failed.
2011-05-24STORM-1256 WIP Added perpetual indicator for progress of applying changes.Vadim ProductEngine
2011-05-24Added badges version 0.1 to buttons.Leslie Linden
Reviewed by Richard
2011-05-24merge changes for STORM-1277Debi King (Dessie)
2011-05-24STORM-1256 WIP Fixed resetting the Environment tab if a server env. update ↵Vadim ProductEngine
comes while your preference is using personal env. settings. The fix is to re-add server skies to our WL param mgr regardless of user preferences.
2011-05-24merge up to latest viewer-development with mesh changesDebi King (Dessie)
2011-05-24STORM-1256 WIP Improvements to region enviroment settings editing.Vadim ProductEngine
* Enable/disable controls according to the region permissions. * Update controls when region settings update comes.
2011-05-23CHOP-661: Add information to try to zero in on remaining failures.Nat Goodspeed
Make testrunner.py module interpret $INTEGRATION_TEST_VERBOSE environment variable, setting module global VERBOSE. Enable/disable debug() output based on that variable, defaulting to VERBOSE True. Add debug() output to freeport(), including reporting exceptions. Add debug() output to test_llsdmessage_peer.py, including normal BaseHTTPRequestHandler output: when VERBOSE is set, don't suppress log_request() or log_error() output. Add C++ verbose() function to query $INTEGRATION_TEST_VERBOSE, broken out as two functions so we only have to interpret the value once. Default to 'true'. Move C++ commtest_data::getport(variable) function to global namespace, broken out as two functions to cache the value. Report value received when verbose() returns true.
2011-05-23fix VWR-25036eli_linden
2011-05-23FIX VWR-25029eli_linden
2011-05-23FIX VWR-25028eli_linden
2011-05-23FIX VWR-25027eli_linden
2011-05-23EXP-826 FIX Help -> About Secondlife Info is corrupted.callum
2011-05-23adding marketplace inbox and outboxLeyla Farazha
reviewed by Leslie
2011-05-23FIX VWR-25025 en_xui_changeeli_linden
2011-05-23SH-1492 WIPBrad Payne (Vir Linden)
2011-05-23mergeBrad Payne (Vir Linden)
2011-05-23SH-1492 WIPBrad Payne (Vir Linden)
2011-05-23FIX VWR-25024 en_xui_changeeli_linden
2011-05-23FIX VWR-25023 en_xui_changeeli_linden
2011-05-23FIX VWR-25022 en_xui_changeeli_linden
2011-05-23FIX VWR-24753eli_linden
2011-05-23STORM-1275 FIX viewer gets caught in infinite loop for decompstubNyx (Neal Orman)
Fixed setting the initialized flag for the decomposition stub case (for OS builds) so that the viewer doesn't hang when initializing the stub. Note that initialized will be set to true even when instance will return NULL.
2011-05-23Fix for sh-788prep
2011-05-23FIX VWR-25016 en_xui_changeeli_linden
2011-05-23STORM-1256 WIP Fixed a crash.Vadim ProductEngine
2011-05-23Another fix for build failure - unused variable warningBrad Payne (Vir Linden)
2011-05-23Fixing missing newline that's making linux build failBrad Payne (Vir Linden)
2011-05-23sync with viewer-developmenteli_linden
2011-05-23mergeBrad Payne (Vir Linden)
2011-05-23SH-1492 WIPBrad Payne (Vir Linden)
2011-05-23SH-1492 WIPBrad Payne (Vir Linden)
2011-05-23STORM-1256 WIP Moved a public method to the appropriate place.Vadim ProductEngine
2011-05-23STORM-1256 WIP Implemented editing region environment settings via the ↵Vadim ProductEngine
Region/Estate floater.
2011-05-23SH-1616 FIX SL client crashes on startup for debug buildsNyx (Neal Orman)
Added more NULL checks for llconvexdecompositionstub, to avoid crashing. Clients won't be able to upload meshes using the stub, but should be able to run the client otherwise.
2011-05-23merge latest changes (post-2.7.0) from viewer-developmentOz Linden
2011-05-23SH-1492 WIPBrad Payne (Vir Linden)
2011-05-23increment viewer version to 2.7.1Oz Linden
2011-05-23Added tag 2.7.0-start for changeset 8835e0e3c0d3Oz Linden
2011-05-21fix oops when cleaning up temporary ifndefsOz Linden
2011-05-20merge changes for beta branch tagsOz Linden