b9bb792c47
increment viewer version to 2.6.8
2011-05-02 10:05:00 -04:00
79c89bc0e6
Added tag 2.6.7-start for changeset ce588bc1ae8e
2011-05-02 10:04:23 -04:00
1cfe556769
STORM-1215: restore INSTALL_PROPRIETARY in Release builds, remove incorrect use of LL_RELEASE_FOR_DOWNLOAD from ReleaseOS
2011-05-02 09:25:08 -04:00
5b3b0a6f2a
merge changes for storm-1182
2011-05-02 07:27:28 -04:00
2ace3d7ce4
merge changes for storm-1128b
2011-05-02 07:26:29 -04:00
818f12fbf7
merge changes for storm-380
2011-05-02 07:24:50 -04:00
a32daa0c10
merge changes for vwr-25126
2011-05-02 07:24:15 -04:00
929bde3ed0
merge changes for storm-229
2011-05-02 07:23:19 -04:00
5a280f320e
merge changes for storm-956
2011-05-02 07:19:07 -04:00
37084d7edb
STORM-1213 : pull from viewer-experience-merge
2011-04-29 18:04:23 -07:00
a5659ac3c9
STORM-1207 and STORM-1211 : pull l10n changes from eli's repo
2011-04-29 15:43:44 -07:00
89216a6c21
Merged with viewer-development.
...
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-29 14:23:27 -07:00
4bfb06944a
WIP CT-641 PL translation for Viewer set23, new files
2011-04-29 13:16:32 -07:00
2d5b5e37d5
WIP CT-641 PL translation for Viewer set23
2011-04-29 13:16:15 -07:00
72c43237fc
STORM-1039 FIXED Bad iterator access in llavatarnamecache.cpp:564
...
missed else case
2011-04-28 19:33:20 -07:00
443e38f94d
fixed build (again)
2011-04-28 19:13:15 -07:00
6e5794376d
STORM-1039 FIXED Bad iterator access in llavatarnamecache.cpp:564
...
fixed crash on startup
2011-04-28 19:04:08 -07:00
9baeb70ddd
WIP CT-636 CT-637 PL translation for Light Viewer set1 and set2, adding new files
2011-04-28 18:01:54 -07:00
1645ae1f7d
WIP INTL-41 set23 DE/FR/ES/PT translation, new files
2011-04-28 17:20:11 -07:00
f22eacd5de
WIP INTL-41 set23 DE/FR/ES/PT translation; CT-640 set22 PL translation
2011-04-28 17:19:26 -07:00
c14d9b6e5f
fixed build
2011-04-28 16:56:05 -07:00
f5cf067c07
sync up with viewer-development, adding all existing minimal/xui l10n files
2011-04-28 15:30:00 -07:00
edee5b10d4
sync up with viewer-development
2011-04-28 15:19:36 -07:00
09594aa3d5
Automated merge with bundle:E:\code\viewer-experience-merge+c:\users\richard\appdata\local\temp\thg.ia7ixc\http__hg.secondlife.com_viewer-development_csqen8.hg
2011-04-28 15:12:38 -07:00
1128a15f0b
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge/
2011-04-28 14:57:34 -07:00
31a2923b3d
EXP-749 FIX [REGRESSION] Voice status indicator shown in IM session instead of profile pic in Basic and Advanced modes
...
reviewed by Leyla
2011-04-28 14:56:46 -07:00
363e296dde
STORM-1190 : pull into viewer-development
2011-04-27 13:59:25 -07:00
b4cbe98225
STORM-1028 : pull into viewer-development
2011-04-27 12:00:35 -07:00
e6bd982c00
OPEN-50 : backing out that change that is incompatible with Incredibuild.
2011-04-27 10:47:41 -07:00
e1e736eff8
EXP-752 FIX -- When "View Display Names" is disabled, only my own profile 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-26 14:02:41 -07:00
c18e2f74b0
STORM-1182 Use string::rfind instead of string::find
...
... 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-26 22:22:33 +02:00
26f2762b89
Removed an extra variable I'd added.
...
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-25 16:24:16 -07:00
2417cb3021
Update with CG's build.sh patch to upload summary.json.
...
Patch taken from here: https://paste.lindenlab.com/show/6902/
2011-04-25 17:13:51 -04:00
b87cb90a55
increment viewer version to 2.6.7
2011-04-25 09:28:36 -04:00
3f44e78fbe
Added tag 2.6.6-start for changeset 800cefce8d36
2011-04-25 09:27:39 -04:00
95f41fbd9b
STORM-1182 FIX Fixed XUI Preview tool not loading XML files from a dev checkout on Mac.
...
Ported Vadim's STORM-1182 fix for Linux (3d30b2bc1369) to the
corresponding Mac file.
2011-04-25 13:46:31 +02:00
10776d2706
merge changes for storm-1111
2011-04-25 07:36:03 -04:00
c0fc4d81e6
merge changes for storm-1039
2011-04-25 07:35:32 -04:00
e75d8342e0
merge changes for storm-898
2011-04-25 07:34:59 -04:00
5376850ef2
merge changes for storm-640
2011-04-25 07:34:22 -04:00
8f3c46fa37
merge changes for storm-891
2011-04-25 07:33:46 -04:00
414e797ef2
merge changes for storm-595
2011-04-25 07:33:15 -04:00
0bb7c0d351
merge changes for storm-320
2011-04-25 07:32:41 -04:00
391bef0df0
fix DOS line endings
2011-04-22 16:03:31 -04:00
b9c7d38370
merge changes for beta fixes
2011-04-22 11:52:02 -04:00
0656620e2d
merge changes for storm-1187
2011-04-22 11:49:41 -04:00
06c4819b09
merge avatar physics fixes
2011-04-21 21:47:09 -04:00
8c4555d54f
Backed out changeset: e7b38729ad6d
2011-04-21 18:04:38 -07:00
af6f2c8b22
SH-1381 FIXED Avatar Physics behavior is tightly tied to viewer framerate
...
Changed range of gain; previous range was too small.
2011-04-21 20:30:38 -04:00
b15dca2263
merge changes for storm-1095
2011-04-21 20:23:26 -04:00
Oz Linden