summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-02-14Added tag 2.6.0-start for changeset 92e58e51776aOz Linden
2011-02-14STORM-949 FIXED Actual usernames removed from XUI files.Seth ProductEngine
Actual usernames are replaced with "TestString PleaseIgnore" in EN locale with setting translate="false" flag for affected widgets. Translated phrases with actual usernames are removed from XUI files in other locales.
2011-02-11STORM-975 : pull into viewer-developmentMerov Linden
2011-02-11STORM-833 : pull into viewer-developmentMerov Linden
2011-02-11STORM-937 : Use subprocess instead os commands in python, suppress crufty ↵Merov Linden
svn code
2011-02-11merge local changesOz Linden
2011-02-11pull back release tag from viewer-betaOz Linden
2011-02-11Added tag 2.5.0-release, DRTVWR-31_2.5.0-release for changeset b723921b5c71Dessie Linden
2011-02-11STORM-680 FIXED (Avaline callers are added to the Recent list)paul_productengine
- When accepting an avaline call, add a caller to the recent list as AvalineListItem - When adding item to the LLRecentPeople, check whether item with the same phone number exists and delete it if exists. This is need to avoid duplication in the Recent list of the panel People.
2011-02-11STORM-980 Appearance panel / Wear button is too wideJonathan Yap
2011-02-11OPEN-29 Cleanup: strip trailing whitespaceBoroondas Gupte
As people will have to rebuild half the tree anyway, because these headers changed, we might as well prettify them a bit.
2011-02-11OPEN-29 Cleanup: removed superflous "public:"Boroondas Gupte
Not related, just a while-I'm-at-it thing.
2011-02-11OPEN-29 Cleanup: removed extra qualification ‘LLDir_Win32::’ on member ↵Boroondas Gupte
‘getNextFileInDir’ Before OPEN-29, when lldir_win32.h would have been included when building for Linux, GCC would error out with indra/llvfs/lldir_win32.h:50: error: extra qualification ‘LLDir_Win32::’ on member ‘getNextFileInDir’ which, although unintended, probably was a Good Thing (TM), as this would have aborted the build, so that the wrong include would be noticed. Now that we explicitly error out with a (hopefully) useful error message, this isn't needed anymore.
2011-02-11OPEN-29 Error out if lldir_<platform>.h is included when building for a ↵Boroondas Gupte
different platform As far as I know, there is no good reason to include e.g. indra/llvfs/lldir_win32.h while not building for a windows target, so be better prevent this to avoid hard to find errors.
2011-02-10STORM-979 selection outline from inventory bottom panel buttons is cut at ↵Jonathan Yap
the left side when clicked.
2011-02-10STORM-986 : Fix for Linux buildMerov Linden
2011-02-10STORM-986 FIX (build error/Linux) media_plugin_webkit errors on some Windows ↵callum
systems
2011-02-10OPEN-1: (partial) use environment when building with Visual Studio ExpressOz Linden
2011-02-10OPEN-1: (partial) use environment when building with Visual Studio ExpressOz Linden
2011-02-09STORM-981 : Fix Linux link issues when LL_TESTS is ONMerov Linden
2011-02-09STORM-986 : pull into viewer-developmentMerov Linden
2011-02-09STORM-937 : Fix python scripts shebang line and license header for consistencyMerov Linden
2011-02-09pull from viewer-developmentMerov Linden
2011-02-10STORM-833 FIXED "i" button overlapping text in name list controls like Group ↵Seth ProductEngine
Members list.
2011-02-09Automated merge with http://hg.secondlife.com/viewer-developmentXiaohong Bao
2011-02-09trivial: remove some redundant code.Xiaohong Bao
2011-02-09Additional fix for llmediaplugintest compilation failure after fix for VWR-21275callum
2011-02-09debug code for SH-924: [PUBLIC-JIRA-USERS] Viewer crash in ↵Xiaohong Bao
LLSurface::getWaterHeight
2011-02-09STORM-977 llmediaplugintest shows up even though -DLL_TESTS:BOOL=OFF has ↵Jonathan Yap
been used
2011-02-08STORM-601 : pull into viewer-developmentMerov Linden
2011-02-08STORM-433 : pull into viewer-developmentMerov Linden
2011-02-08STORM-507 : pull into viewer-developmentMerov Linden
2011-02-08STORM-953 : pull into viewer-developmentMerov Linden
2011-02-08STORM-955 : pull into viewer-developmentMerov Linden
2011-02-08STORM-960 : pull into viewer-developmentMerov Linden
2011-02-08VWR-21275 FIX // *SOME* Windows systems fail to load the Qt plugins if the ↵callum
current working Reviewed by Richard - http://codereview.lindenlab.com/6011001/
2011-02-08STORM-974 Removed my change to flip down-arrow to an up-arrow in the ↵Jonathan Yap
Landmark panel. Not in scope of this jira.
2011-02-07STORM-975 forgot to update contributions.txtJonathan Yap
2011-02-07STORM-974 forgot to edit contributions.txtJonathan Yap
2011-02-07STORM-974 UI button alignment issues in Landmark, About Land, and Hardware ↵Jonathan Yap
Settings windows
2011-02-06STORM-975 Duplicated menu entry Develop/Ui/Region Debug ConsoleJonathan Yap
2011-02-06OPEN-1 WORKAROUND correct build arguments again for VS ExpressOz Linden
2011-02-06OPEN-1 WORKAROUND correct build arguments again for VS ExpressOz Linden
2011-02-06OPEN-1 WORKAROUND correct build arguments for VS ExpressOz Linden
2011-02-06OPEN-1 WORKAROUND correct build arguments for VS ExpressOz Linden
2011-02-06OPEN-1 WORKAROUND revert change to cmake string for VS 8Oz Linden
2011-02-06OPEN-1 WORKAROUND revert change to cmake string for VS 8Oz Linden
2011-02-06OPEN-1 WORKAROUND - create a VCexpressRelWithDebInfo for compiling with VS ↵Oz Linden
Express
2011-02-14merge up to latest viewer-developmentOz Linden
2011-02-11merge up to lastest upstreamOz Linden