summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2015-02-04merge storm-2082 changesOz Linden
2015-02-04allow visually muted results to be cached from const methodsOz Linden
2015-02-03remove unused RenderAvatarComplexityLimit; replace with visual muting based ↵Oz Linden
on render weight
2015-01-30tone down visually muted avatar colorsOz Linden
2015-02-03STORM-2082 Reformat preset floaters.Jonathan Yap
Remove Impostor checkbox. That control is now merged into the right side of the impostors slider. Maximum ARC still depends on impostors being enabled. Once that dependency is removed in llvoavatar then it will be necessary to reflect that change in the UI code.
2015-01-29merge more fixes from JonathanOz Linden
2015-01-29add default values (some sensitive to graphics setting) for avatar rendering ↵Oz Linden
limits
2015-01-27don't use jellybaby rendering for impostors (visually muted != impostored)Oz Linden
2015-01-26minor code cleanups, remove friend and conversation status as visual mute ↵Oz Linden
criteria
2015-01-25STORM-2082 Clear preset in use when resetting to hardware defaultsJonathan Yap
2015-01-24STORM-2082 Add 5px more blank space around quality slider.Jonathan Yap
Slightly adjust the names of the help text in the three new floaters.
2015-01-23Explain why LLHost::setHostByName() / getHostName() test skipped.Nat Goodspeed
A skip() stating that we don't yet understand why the test fails is implicitly an open action item. This one isn't open. Save future developers the research.
2015-01-23Re-enable skipped test: evidently Windows APR libs CAN transcode.Nat Goodspeed
I don't know at what point the skip() was introduced, but that test now passes even on Windows.
2015-01-23Automated merge with http://bitbucket.org/lindenlab/viewer-tools-updateNat Goodspeed
2015-01-23Make MandatoryUpdateMachine use LLLoginInstance's LLNotificationsInterface.Nat Goodspeed
LLLoginInstance has a test hook setNotificationsInterface(), used by lllogininstance_test.cpp to redirect notifications through a dummy LLNotificationsInterface implementation. Certain of LLLoginInstance's MandatoryUpdateMachine state classes need to post notifications too; but until now they directly called LLNotificationsUtil::add(). In the production viewer, this should (!) be the same as calling through LLLoginInstance::mNotifications -- but it broke two of the LLLoginInstance unit tests, so they were skipped. Since MandatoryUpdateMachine's constructor is already passed the invoking LLLoginInstance&, make it store the reference. Add MandatoryUpdateMachine:: getNotificationsInterface(), which forwards to new LLLoginInstance:: getNotificationsInterface(). Change LLNotificationsUtil::add() calls in MandatoryUpdateMachine state classes to call through mMachine's getNotificationInterface() instead. This allows us to remove #include "llnotificationsutil.h" from lllogininstance.cpp, also that #include plus stub LLNotificationsUtil::add() implementation from lllogininstance_test.cpp. Finally, it allows us to remove the skip() calls from the two unit tests.
2015-01-22Automated merge with http://bitbucket.org/lindenlab/viewer-tools-updateNat Goodspeed
2015-01-22Disambiguate constructor's initialization call to its base class.Nat Goodspeed
A particular LLInitParam::TypeValuesHelper specialization is derived from a different TypeValuesHelper specialization. The subclass constructor TypeValuesHelper(...) has previously forwarded the call to its base-class constructor with: TypeValuesHelper(val): TypeValuesHelper(val) {} This is the first time I've looked at that; I'm a bit surprised that previous compilers blithely accept it, and apparently understand the intent. gcc 4.7 complains that we would need to turn on -std=c++11 to support delegating constructors; obviously the second TypeValuesHelper is now assumed to be the class being defined, rather than its base class. Fortunately the class already has typedefs for both specializations, fully qualified with all template parameters, so I simply replaced the second TypeValuesHelper reference with base_t.
2015-01-21For Linux, add libalut.so.0.0.0.0 and libalut.so.0 to viewer tarball.Nat Goodspeed
The former is the real .so, to which libalut.so is only a symlink. We were packaging the symlink without including its target. (This appears to have changed since our last Vivox drop for Linux.)
2015-01-21Make Linux viewer build consume slplugins package, and copy its filesNat Goodspeed
into eventual viewer package -- instead of finding them in the viewer build tree. Also update Windows to current slplugins package build.
2015-01-21Automated merge with http://bitbucket.org/lindenlab/viewer-tools-updateNat Goodspeed
2015-01-21Merge fix for copying Linux Vivox filesNat Goodspeed
2015-01-21Backed out changeset 1e36e0629994 copying .dylibs on LinuxNat Goodspeed
The .dylib files in the Linux Vivox package were erroneous to start with; while the affected changeset bypassed copy errors, it too was wrong. Now that the Linux Vivox package contains Linux .so files, revert to the correct filenames to copy.
2015-01-21STORM-2082 Put "Default" at the top of the non-Delete comboboxes.Jonathan Yap
2015-01-20STORM-2082 Finally(?) deal properly with dirty UI processing.Jonathan Yap
Code cleanup, some per bitbucket comments.
2015-01-20STORM-2082 Still trying to work out the dirtyChilds issue. Also made some ↵Jonathan Yap
small UI adjustments.
2015-01-20STORM-2082 Update to new UI design. Bugs are not worked out yet.Jonathan Yap
2015-01-19Automated merge with http://bitbucket.org/lindenlab/viewer-tools-updateNat Goodspeed
2015-01-19On Linux, don't try to copy SLPlugin or the webkit or gstreamer pluginsNat Goodspeed
since we're not building them as part of the viewer build any more.
2015-01-19Link viewer with OpenAL if appropriateNat Goodspeed
2015-01-19Reorder Boost libraries for Linux linkerNat Goodspeed
2015-01-19Automated merge with http://bitbucket.org/lindenlab/viewer-tools-updateNat Goodspeed
2015-01-16Linux llimagej2ckdu_test.cpp no longer needs obsolete stubs.Nat Goodspeed
Use the same signatures as for the other platforms.
2015-01-16Continue gradually replacing Boost.Lambda with Boost.Phoenix.Nat Goodspeed
For some reason, after the upgrade to Boost 1.57, gcc 4.6.3 has trouble with the boost::lambda::_1 usage in stringize.h. This is consistent with other cases we've encountered in which Boost.Lambda appears to be unmaintained and losing its compatibility with other libraries. Fortunately Phoenix provides a functional equivalent, albeit spelled differently.
2015-01-16Add flags to inject extra debugging information (via Sovreign Engineer)callum_linden
2015-01-15STORM-2082 Use correct icon for checkmarkJonathan Yap
Redo UI layout to indicate the two dependencies on the Imposters checkbox Reverse the ARC slider
2015-01-15STORM-2082 Remove Avatar detail from Basic tabJonathan Yap
2015-01-14STORM-2082 Assorted UI tweaks, better MaximumARC formula, pulldowns ↵Jonathan Yap
disappear faster
2015-01-14merge changes for fixes from nat and auraOz Linden
2015-01-14Integrate Callum's Mac slplugins packageNat Goodspeed
2015-01-13changes to fix compiler warnings merged in from viewer-releaseOz Linden
2015-01-13merge changes for 3.7.24-releaseOz Linden
2015-01-12On Mac, if we can't symlink .dylibs, print error message and continue.Nat Goodspeed
To this point, we've been failing the build with a Python OSError traceback, which is less than ideal.
2015-01-12increment viewer version to 3.7.25Oz Linden
2015-01-12Experimentally try full-size LLLeap stream test on Windows.Nat Goodspeed
The new toolchain may (!) have fixed a longstanding bug in LLLeap / APR when we try to pump large volumes of data through a Windows named pipe using APR nonblocking I/O. This used to fail pretty consistently because the APR nonblocking write call would sometimes spuriously return "would block" when in fact the data buffer was completely written; the caller would later retry, which of course would duplicate some of the data in the pipe. Preliminary experiments with VS 2013 suggest this may have been resolved. This changeset is to propagate the experiment to a wider range of Windows systems; we may need to revert it if in fact the bug persists.
2015-01-12Update viewer_package.py to grab slplugin.exe et al. from package.Nat Goodspeed
This only applies to the Windows package so far, because so far only the Windows package exists.
2015-01-08Rationalize use of AUTOBUILD environment variable across languages.Nat Goodspeed
Ensure that AUTOBUILD is always in native path syntax on every platform. Remove local build.sh logic to infer AUTOBUILD: either the generic build.sh has set it properly, or scream for help. Since cygwin bash scripts need a cygwin-syntax path to autobuild, convert to a local 'autobuild' variable using shell_path. Remove kludges in other languages involving cygdrive twiddling.
2015-01-07Automated merge with ssh://bitbucket.org/lindenlab/viewer-tools-updateNat Goodspeed
2015-01-07First cut at consuming new slplugins autobuild package.Nat Goodspeed
The contents are extracted, but not yet built into the viewer installer.
2015-01-07STORM-2082 Display active preset as first choice in dropdown boxJonathan Yap
2015-01-07STORM-2082 MergeJonathan Yap