callum
814e540e85
EXP-743 FIX Side bar panel is visible on login screen after getting
...
'We're having trouble connecting' message
2011-05-02 13:40:41 -07:00
Oz Linden
b9bb792c47
increment viewer version to 2.6.8
2011-05-02 10:05:00 -04:00
Oz Linden
79c89bc0e6
Added tag 2.6.7-start for changeset ce588bc1ae8e
2011-05-02 10:04:23 -04:00
Oz Linden
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
Oz Linden
5b3b0a6f2a
merge changes for storm-1182
2011-05-02 07:27:28 -04:00
Oz Linden
2ace3d7ce4
merge changes for storm-1128b
2011-05-02 07:26:29 -04:00
Oz Linden
818f12fbf7
merge changes for storm-380
2011-05-02 07:24:50 -04:00
Oz Linden
a32daa0c10
merge changes for vwr-25126
2011-05-02 07:24:15 -04:00
Oz Linden
929bde3ed0
merge changes for storm-229
2011-05-02 07:23:19 -04:00
Oz Linden
5a280f320e
merge changes for storm-956
2011-05-02 07:19:07 -04:00
Merov Linden
37084d7edb
STORM-1213 : pull from viewer-experience-merge
2011-04-29 18:04:23 -07:00
Leyla Farazha
3d64e29007
merge
2011-04-29 16:07:56 -07:00
callum
af41eb0d2c
EXP-742 FIX [PUBLIC] CTRL-ALT-w doesn't "spin_over"
2011-04-29 15:54:45 -07:00
Leyla Farazha
5fe3675564
EXP-761, EXP-758
2011-04-29 15:53:14 -07:00
Leyla Farazha
314961674a
EXP-769 Group call requests received in Basic mode
2011-04-29 15:52:48 -07:00
Merov Linden
a5659ac3c9
STORM-1207 and STORM-1211 : pull l10n changes from eli's repo
2011-04-29 15:43:44 -07:00
callum
367823ced0
EXP-623 FIX Selecting fly option while on click to walk path flys avatar to
...
end point but avatar spins and shakes when arriving at click point
2011-04-29 15:35:22 -07:00
Ricky Curtice
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
Eli Linden
4bfb06944a
WIP CT-641 PL translation for Viewer set23, new files
2011-04-29 13:16:32 -07:00
Eli Linden
2d5b5e37d5
WIP CT-641 PL translation for Viewer set23
2011-04-29 13:16:15 -07:00
Richard Linden
72c43237fc
STORM-1039 FIXED Bad iterator access in llavatarnamecache.cpp:564
...
missed else case
2011-04-28 19:33:20 -07:00
Richard Linden
443e38f94d
fixed build (again)
2011-04-28 19:13:15 -07:00
Richard Linden
6e5794376d
STORM-1039 FIXED Bad iterator access in llavatarnamecache.cpp:564
...
fixed crash on startup
2011-04-28 19:04:08 -07:00
Eli Linden
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
Eli Linden
1645ae1f7d
WIP INTL-41 set23 DE/FR/ES/PT translation, new files
2011-04-28 17:20:11 -07:00
Eli Linden
f22eacd5de
WIP INTL-41 set23 DE/FR/ES/PT translation; CT-640 set22 PL translation
2011-04-28 17:19:26 -07:00
Richard Linden
c14d9b6e5f
fixed build
2011-04-28 16:56:05 -07:00
Eli Linden
f5cf067c07
sync up with viewer-development, adding all existing minimal/xui l10n files
2011-04-28 15:30:00 -07:00
Eli Linden
edee5b10d4
sync up with viewer-development
2011-04-28 15:19:36 -07:00
Richard Linden
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
Richard Linden
1128a15f0b
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge/
2011-04-28 14:57:34 -07:00
Richard Linden
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
brad kittenbrink
0d5a0cefd4
Merge
2011-04-27 19:20:55 -07:00
brad kittenbrink
42fe138cbb
Incorporated some suggestions from code review for VWR-25610
2011-04-27 19:13:17 -07:00
Leyla Farazha
f56a2e55cc
adding newline at end of llfloatersounddevices.cpp
2011-04-27 18:17:09 -07:00
Leyla Farazha
8919801559
adding llfloatersounddevices.cpp/.h to the cmake file
2011-04-27 17:59:15 -07:00
Leyla Farazha
0453808465
Fixed floater sound devices title
2011-04-27 17:41:49 -07:00
Leyla Farazha
a59de335c5
EXP-626 New bottomtray tooltips for basic mode
2011-04-27 17:41:34 -07:00
Leyla Farazha
892c5109e8
EXP-670 Voice for basic mode new files
...
reviewed by merov
2011-04-27 16:45:57 -07:00
Leyla Farazha
37ef2c4f0f
EXP-670 Voice for basic mode
...
reviewed by Merov
http://codereview.lindenlab.com/6231263/
2011-04-27 16:45:33 -07:00
Leyla Farazha
d4ee7ac748
Merge
2011-04-27 16:20:44 -07:00
brad kittenbrink
8a265498d0
Merge.
2011-04-27 16:02:30 -07:00
brad kittenbrink
36986de1fc
Fix for mac compile error in VWR-25608 fix.
2011-04-27 16:02:16 -07:00
Merov Linden
363e296dde
STORM-1190 : pull into viewer-development
2011-04-27 13:59:25 -07:00
Debi King (Dessie)
adf7a56894
Added tag DRTVWR-44_2.6.2-release, 2.6.2-release for changeset 214180ad5714
2011-04-27 16:11:07 -04:00
Merov Linden
b4cbe98225
STORM-1028 : pull into viewer-development
2011-04-27 12:00:35 -07:00
Merov Linden
e6bd982c00
OPEN-50 : backing out that change that is incompatible with Incredibuild.
2011-04-27 10:47:41 -07:00
Debi King (Dessie)
1143f2c1bd
Added tag DRTVWR-46_2.6.3-release, 2.6.3-release for changeset 8f2da1701c81
2011-04-27 12:28:40 -04:00
Debi King (Dessie)
a3d89650a9
merged .hgtags from viewer-pre-release
2011-04-27 12:27:05 -04:00
brad kittenbrink
f4540fab48
FIX CHOP-629: Enabled debugging info for llcommon.dll
2011-04-26 17:06:04 -07:00