summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2015-03-24Merged lindenlab/viewer-tools-update into defaultCinder Biscuits
2015-03-22Merged lindenlab/viewer-tools-update into defaultCinder Biscuits
2015-03-17improve file name handling and clean up some error checksOz Linden
2015-03-17MAINT-4995: fix stored favorites for login bar (close input files before ↵Oz Linden
opening them for writing)
2015-03-23correct merge errorOz Linden
2015-03-23merge changes for 3.7.26-releaseOz Linden
2015-03-23increment viewer version to 3.7.27Oz Linden
2015-03-06MAINT-4967 FIX - log spam removedBrad Payne (Vir Linden)
2015-03-04MAINT-4858 FIXBrad Payne (Vir Linden)
2015-02-26Merged lindenlab/viewer-tools-update into defaultCinder Biscuits
2015-02-25mergeBrad Payne (Vir Linden)
2015-02-24merge changes for 3.7.25-releaseOz Linden
2015-02-24increment viewer version to 3.7.26Oz Linden
2015-02-24merge changes for MAINT-4790Oz Linden
2015-02-22Merged lindenlab/viewer-tools-update into defaultCinder Biscuits
2015-02-13Merge viewer-release and become 3.7.25Mnikolenko ProductEngine
2015-02-09included libopenal in linux packageOz Linden
2015-02-08OPEN-292 - Remove lscript from project,Cinder
Remove legacy udp script upload methods, Refactor script runtime perms from three arrays to one struct array so we don't have to juggle array order anymore.
2015-01-30MAINT-4853 FIXED Pressing the ENTER key when entering a location into the ↵Mnikolenko ProductEngine
Type a location field, doesn't log you in
2015-01-30MAINT-4853 FIXED Pressing the ENTER key when entering a location into the ↵Mnikolenko ProductEngine
Type a location field, doesn't log you in
2015-01-28MAINT-4744: Eliminate viewer dependency on (old) GNU libstdc++.Nat Goodspeed
To be more accurate, this changeset doesn't actually eliminate the dependency: it eliminates the use cases for the llifstream / llofstream feature that requires it. Currently you can construct an llifstream or llofstream from an open LLFILE* file handle (or, except on Windows, an int file descriptor). But rather than containing a streambuf implementation based on FILE*, llfile.h relies on the fact that the Windows std::filebuf happens to support that as a nonstandard extension; also on a nonstandard GNU extension __gnu_cxx::stdio_filebuf<char>. To move from GNU libstdc++ to clang's libc++ (the direction on Mac), we could code a streambuf that supports FILE*. But before doing that, it's worth asking whether anyone actually uses this questionable feature. In fact there were only two methods: LLWearable::exportFile() and importFile() -- and only one call to either, in LLViewerWearable::saveNewAsset(). The code in saveNewAsset() opened the LLFILE* immediately before calling exportFile(), meaning we could reasonably push the open operation down into exportFile(). That logic was complex anyway due to the need for the caller to close the LLFILE* regardless of the success of the exportFile(). Change LLWearable::exportFile() and importFile() to accept a std::string filename rather than an open LLFILE*. Change LLViewerWearable::saveNewAsset() to simply call exportFile(filename) rather than horsing around with an LLFILE* handle. (This improves the code in another way too: it encapsulates the need to open the relevant file in binary mode. Previously, each caller had to remember to do that.) To prevent inadvertent reintroduction of ll[io]fstream(LLFILE*) code, add llstream_LLFILE preprocessor macro (default 0) to control access to the relevant constructors. Also suppress rdbuf() override, the only method whose signature references llstdio_filebuf.
2015-01-27Include MSVCP120.DLL and MSVCR120.DLL in Windows viewer package.Nat Goodspeed
Generalize Copy3rdPartyLibs.cmake to eliminate some clone-and-tweak redundancy.
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-22MAINT-4790 WIP Previously selected login location is correctly shown now. ↵Mnikolenko ProductEngine
Font on the Log In button was changed back. Text offset was set for Locations combobox.
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-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-19Automated merge with http://bitbucket.org/lindenlab/viewer-tools-updateNat Goodspeed
2015-01-19MAINT-4790 WIP Show focused background image for login text fields.Mnikolenko ProductEngine
2015-01-15SL-92 WIP - more on hover managementBrad Payne (Vir Linden)
2015-01-14merge changes for fixes from nat and auraOz Linden
2015-01-14SL-92 WIP - more on region notification and managing hoverBrad Payne (Vir Linden)
2015-01-14Integrate Callum's Mac slplugins packageNat Goodspeed
2015-01-14MAINT-4790 WIP code clean-upMnikolenko ProductEngine
2015-01-14MAINT-4790 WIP XML changesMnikolenko ProductEngine
2015-01-13mergeBrad Payne (Vir Linden)
2015-01-13SL-92 WIP - added signal for simulator features received. Use to keep hover ↵Brad Payne (Vir Linden)
floater UI synced with region support for hover.
2015-01-13changes to fix compiler warnings merged in from viewer-releaseOz Linden
2015-01-13Merge viewer-release and become 3.7.25maksymsproductengine
2015-01-13merge changes for 3.7.24-releaseOz Linden
2015-01-13MAINT-4790 WIP XML changesMnikolenko ProductEngine
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