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
brad kittenbrink
2840bff773
FIX VWR-25610: LLControlCroup::loadFromFile makes unnecessary copies of large LLSD objects.
2011-04-26 15:10:39 -07:00
brad kittenbrink
d4b9db012e
FIX VWR-25609: crash on shutdown in LLGLNamePool::sInstances destructor
2011-04-26 15:04:22 -07:00
brad kittenbrink
4bc90f24b3
FIX VWR-25608 error on shutdow due to buffer overflow in LLVFS::audit
2011-04-26 14:58:58 -07:00
Leslie Linden
f7bd5b9894
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
Leslie Linden
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
Leslie Linden
d952f97459
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
Boroondas Gupte
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
Merov Linden
1ef083244a
EXP-664 : Add JPEG2000 compression settings for test, fix one crash on compression, enhanced error handling on image upload
2011-04-25 22:37:15 -07:00
Leslie Linden
36f8899861
EXP-637 FIX -- As a new user, I would like Second Life to start up with a maximized window to fully immerse myself in the experience
...
Mac viewer now properly supports the calls to maximize and unmaximize the screen.
Reviewed by Callum
2011-04-25 17:31:04 -07:00
Ricky Curtice
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
Nat Goodspeed
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
Debi King (Dessie)
ddf0d70a08
Added tag DRTVWR-50_2.6.5-beta1, 2.6.5-beta1 for changeset 7db558aaa7c1
2011-04-25 11:56:17 -04:00
Oz Linden
b87cb90a55
increment viewer version to 2.6.7
2011-04-25 09:28:36 -04:00
Oz Linden
3f44e78fbe
Added tag 2.6.6-start for changeset 800cefce8d36
2011-04-25 09:27:39 -04:00
Boroondas Gupte
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