summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-05-04merge changes for storm-1141Oz Linden
2011-05-04merge changes for storm-1223, storm-1218, storm-1216Oz Linden
2011-05-04merge changes for storm-1219Oz Linden
2011-05-04merge changes for open-61Oz Linden
2011-05-03Merge.brad kittenbrink
2011-05-03FIX VWR-22337 translation (in utf-8) for "loading terms of service" stringEli Linden
2011-05-03FIX VWR-25074 add missing Danish translationEli Linden
2011-05-02CHOP-599: if build.sh creates summary.json, package it with viewer.Nat Goodspeed
Recent versions of the viewer's build-dependent build.sh create and upload a summary.json file in the top level of the source repository checkout. Bundle that into the viewer installer. This is the one file that contains the viewer's version.
2011-05-02WIP VWR-25074 add missing string in English, pending actual Danish translationEli Linden
2011-05-02sync up with viewer-developmentEli Linden
2011-05-02increment viewer version to 2.6.8Oz Linden
2011-05-02merge changes for storm-1182Oz Linden
2011-05-02merge changes for storm-1128bOz Linden
2011-05-02merge changes for storm-380Oz Linden
2011-05-02merge changes for vwr-25126Oz Linden
2011-05-02merge changes for storm-229Oz Linden
2011-05-02merge changes for storm-956Oz Linden
2011-04-29STORM-1213 : pull from viewer-experience-mergeMerov Linden
2011-04-29STORM-1207 and STORM-1211 : pull l10n changes from eli's repoMerov Linden
2011-04-29Merged with viewer-development.Ricky Curtice
The reason was to manually resolve a couple of merge problems, as upstream has had several changes since this was applied, and some of the changes overlapped.
2011-04-29WIP CT-641 PL translation for Viewer set23, new filesEli Linden
2011-04-29WIP CT-641 PL translation for Viewer set23Eli Linden
2011-04-28STORM-1039 FIXED Bad iterator access in llavatarnamecache.cpp:564Richard Linden
missed else case
2011-04-28fixed build (again)Richard Linden
2011-04-28STORM-1039 FIXED Bad iterator access in llavatarnamecache.cpp:564Richard Linden
fixed crash on startup
2011-04-28WIP CT-636 CT-637 PL translation for Light Viewer set1 and set2, adding new ↵Eli Linden
files
2011-04-28WIP INTL-41 set23 DE/FR/ES/PT translation, new filesEli Linden
2011-04-28WIP INTL-41 set23 DE/FR/ES/PT translation; CT-640 set22 PL translationEli Linden
2011-04-28fixed buildRichard Linden
2011-04-28sync up with viewer-development, adding all existing minimal/xui l10n filesEli Linden
2011-04-28sync up with viewer-developmentEli Linden
2011-04-28Automated merge with ↵Richard Linden
bundle:E:\code\viewer-experience-merge+c:\users\richard\appdata\local\temp\thg.ia7ixc\http__hg.secondlife.com_viewer-development_csqen8.hg
2011-04-28Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge/Richard Linden
2011-04-28EXP-749 FIX [REGRESSION] Voice status indicator shown in IM session instead ↵Richard Linden
of profile pic in Basic and Advanced modes reviewed by Leyla
2011-04-27Mergebrad kittenbrink
2011-04-27Incorporated some suggestions from code review for VWR-25610brad kittenbrink
2011-04-27Merge.brad kittenbrink
2011-04-27Fix for mac compile error in VWR-25608 fix.brad kittenbrink
2011-04-27STORM-1028 : pull into viewer-developmentMerov Linden
2011-04-26FIX CHOP-629: Enabled debugging info for llcommon.dllbrad kittenbrink
2011-04-26FIX VWR-25610: LLControlCroup::loadFromFile makes unnecessary copies of ↵brad kittenbrink
large LLSD objects.
2011-04-26FIX VWR-25609: crash on shutdown in LLGLNamePool::sInstances destructorbrad kittenbrink
2011-04-26FIX VWR-25608 error on shutdow due to buffer overflow in LLVFS::auditbrad kittenbrink
2011-04-26EXP-752 FIX -- When "View Display Names" is disabled, only my own profile ↵Leslie Linden
loads, when I click others profiles Avatar username is now looked up in the name cache when it is blank, which happens when display names are turned off apparently. Reviewed by Fredrik.
2011-04-26STORM-1182 Use string::rfind instead of string::findBoroondas Gupte
... so the last occurance of the build prefix in the executable path will be matched. This should avoid cuttung too much subdirs away if someone checks out the source to a path already containing "/build-darwin-" or "/build-linux-".
2011-04-25Removed an extra variable I'd added.Ricky Curtice
Also cleaned up some whitespace-around-operator issues. While removing the extra variable seems to make the code more ugly, all it does is reveal the pre-existing ugliness that had been masked in the past. Trying to find a fix, or even try to come to a real understanding of why this section of code is the way it is, is out of my scope for this task.
2011-04-25increment viewer version to 2.6.7Oz Linden
2011-04-25STORM-1182 FIX Fixed XUI Preview tool not loading XML files from a dev ↵Boroondas Gupte
checkout on Mac. Ported Vadim's STORM-1182 fix for Linux (3d30b2bc1369) to the corresponding Mac file.
2011-04-25merge changes for storm-1111Oz Linden
2011-04-25merge changes for storm-1039Oz Linden
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 11:10:13 +0000