summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
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
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-12MAINT-2560 revertedMnikolenko ProductEngine
2015-01-09FIX MAINT-2701 restore 10 translated strings that were lost during an ↵eli
earlier dev merge (see Jira screenshots for details)
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-08SL-92 WIP - remove hover for self if we receive an appearance with no hover ↵Brad Payne (Vir Linden)
specified
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-07mergeBrad Payne (Vir Linden)
2015-01-07Replace reduce(operator.or_, ...) with any(...).Nat Goodspeed
The any() builtin was introduced in Python 2.5. Not only is its intent clearer, but it handles the case of zero items -- which the reduce(or_) construct does not. Sporadically we've seen exceptions from generate_breakpad_symbols.py when reduce(or_, ...) is given zero items. This masks the actual error (failure to dump symbols? failure to read them?), masquerading as a bug in the Python script.
2015-01-07MAINT-4773 FIXED Some transparent textures are rendered as white.ruslantproductengine
This bug fix related also to MAINT-4092. In 4092 sometimes when we don't have information about the texture during the setup the materail (LLVOVolume::setTEMaterialParams()), we should substitute the material with disabled "diffuse alpha mode" (for detail in cases see MAINT-4092 JIRA ticket comment). This bug fix cover the case when after the loading texture we have all information about alpha mode, and in this case we should restore diffuse alpha mode if need. In short: now we always believe that information about the material is valid (LLVOVolume::setTEMaterialParams()). Of course before setup it we check information about texture (if it possible) , if texture is not exist in database or not 32 bit depth (for diffuse) we made changes. But in all other cases (if we can't receive information about texture) we remeber this case in mWaitingTextureInfo multimap. When information about texture will be available we get it in: LLVOVolume::notify AboutCreatingTexture() or Volume::notifyAboutMissingAsset() and again, we recheck it and if need change (substitute) the material parameters. I suppose that this solution is better than was before. If this patch will be accepted , I think that MAINT-4092 should be rechecked again.
2015-03-05Merge viewer-release and become version 3.7.26simon
2015-03-04MAINT-4169 ShowGreyQueryInUrls debug setting was removed and the grey part ↵Mnikolenko ProductEngine
of the link always appears.
2015-01-16Merge downstream codesimon
2015-01-16MAINT-4804 FIXED Viewer gets stuck in mode sending email with snapshot if ↵andreykproductengine
that fails
2015-01-15MAINT-4777 FIXED Confusing 'Save changes?' dialog when hitting the Delete ↵andreykproductengine
button in notecard edit floater
2015-01-16MAINT-4799 FIXED Show complete avatar names in confirmation dialog.Mnikolenko ProductEngine
2015-01-12MAINT-2742 FIXED Duplicate Display Names appear once in share pickerMnikolenko ProductEngine
2015-01-09MAINT-4169 FIXED grey out all but domain name in SL-links, same as it's done ↵Mnikolenko ProductEngine
for non-Linden URLs
2015-01-08MAINT-3240 Don't show avatar if it's in mute listMnikolenko ProductEngine
2015-01-06MAINT-729 FIXED Hide popup menu (which belongs to old chiclet) when new ↵Mnikolenko ProductEngine
chiclet arrives.
2015-01-05Moved mHoverOffset to LLCharacter so it's accessible inside animations. ↵Brad Payne (Vir Linden)
Apply offset when constrained to ground.
2015-01-05SL-92 WIP - changed setting name to AvatarHoverOffsetZBrad Payne (Vir Linden)