callum
d892256d5b
Merge with head
2011-05-06 13:40:13 -07:00
callum
4ad94507dd
EXP-623 (SUPPLEMENTAL 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-05-06 13:39:27 -07:00
Leyla Farazha
483ceba5f4
EXP-769: "Group call requests received in Basic mode"
...
fixing merge error
2011-05-06 13:36:08 -07:00
Leyla Farazha
4015e6b3c7
fixing flyoutbtn name
2011-05-06 11:39:22 -07:00
Leyla Farazha
8cd0ee8bcc
EXP-789 Reducing size of sound device panel in Basic Mode does not resize elements in the panel and allows panel to be smaller than elements it contains
2011-05-06 11:03:38 -07:00
Leyla Farazha
51a72247f5
EXP-782 Toggling speak button while in call minimizes IM window
2011-05-06 11:03:09 -07:00
Richard Linden
f0d095086f
EXP-501 FIX View button on bottom bar is hidden when launching Basic Viewer...
...
ignore button reordering in basic mode
use preferred button collapse order
2011-05-05 19:09:06 -07:00
Leslie Linden
8a1fabd5a6
Build fix. Added missing cases to a switch statement for bottom tray buttons.
...
Reviewed by Richard.
2011-05-05 11:11:20 -07:00
Richard Linden
47b010fde1
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
2011-05-04 18:10:09 -07:00
Richard Linden
efca808b0c
EXP-584 FIXED View button on bottom bar is hidden when launching Basic Viewer with Voice options added back in
...
corrected order in which buttons are collapsed so that they collapse right to left
2011-05-04 18:04:09 -07:00
Leslie Linden
3063c1be41
EXP-772 -- Log in failure, keeps saying DNS cannot resolve hostname.
...
No real progress on this Jira yet but Mac build was not properly reporting the CURL error string.
This check-in fixes that.
So far, I have backed out URL related changes between 2.6.2 and 2.6.3 without any change in behavior.
Unsure how to proceed next although comparing libcares and libcurl builds between 2.6.2 and 2.6.3 seems
like it could be the next logical step.
Users experiencing the problem can go back to vewere 2.6.2 or adjust DNS settings to use the google free
DNS servers 8.8.8.8 and 8.8.4.4 which should allow them to work around the problem.
Reviewed by Richard.
2011-05-04 16:27:59 -07:00
Leslie Linden
a34cad5f2a
EXP-779 FIX -- Help > About Second Life Reports Kernel Version Twice, Instead of OS Version
...
Modified Mac OS_VERSION string to include OS X version number in addition to Kernel version info.
DARWIN llcommon build now depends on Carbon in order to provide this functionality.
Reviewed by Richard.
2011-05-04 16:13:26 -07:00
Leyla Farazha
90cad613b0
hg merge
2011-05-04 11:17:19 -07:00
Leyla Farazha
f3bb2e31dc
EXP-759 Opening the Voice preferences window from the up arrow on the speak button turns voice off for user without notice also causes calls to be ended
2011-05-04 11:16:08 -07:00
callum
3f9253e783
Merge with http://bitbucket.org/lindenlab/viewer-development (r15992)
2011-05-04 10:36:27 -07:00
Merov Linden
a14172dd40
Sync with viewer-experience
2011-05-03 17:35:38 -07:00
Merov Linden
45145fe7e2
EXP-756 : Move the folder resort to first draw and do it only once
2011-05-03 17:34:53 -07:00
Leyla Farazha
9120a9bf29
merge
2011-05-03 17:16:33 -07:00
Leyla Farazha
950b74c170
EXP-778 Bring up corresponding IM window on connect to new voice call.
2011-05-03 17:12:43 -07:00
Leyla Farazha
8cc430f691
EXP-624 Place profile floater may be opened by SLApp
2011-05-03 17:11:58 -07:00
Merov Linden
b2e36e5222
Sync with viewer-experience
2011-05-03 15:35:29 -07:00
Richard Linden
59f8a2e7a4
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
2011-05-03 15:01:15 -07:00
Richard Linden
29a2e3f2a4
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge
2011-05-03 15:00:49 -07:00
Leyla Farazha
1b601fbdff
EXP-771 Enable call option in Basic Viewer UI
2011-05-03 14:35:07 -07:00
Merov Linden
84499951f2
Sync with viewer-experience
2011-05-03 13:19:17 -07:00
Merov Linden
64b192ed62
EXP-756 : Fix inventory folder ordering on launch
2011-05-03 13:18:16 -07:00
Leyla Farazha
b0ebba414e
merge fix for voice
2011-05-03 10:43:32 -07:00
Richard Linden
d5faa4f38d
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
2011-05-02 17:57:52 -07:00
Richard Linden
78d76eb4b0
Automated merge with bundle:E:\code\viewer-experience+c:\users\richard\appdata\local\temp\thg.t3awyz\ssh__richard@hg.lindenlab.com_richard_viewer-experience-merge_2xcevh.hg
2011-05-02 17:29:56 -07:00
Leyla Farazha
9a6f06687e
merge
2011-05-02 16:38:51 -07:00
Leyla Farazha
f085d242dc
EXP-763 Cannot close IM window using X in upper corner while in a voice call
2011-05-02 16:37:10 -07:00
Richard Linden
315eee3a7c
Backed out changeset: d38e4f4982a0
2011-05-02 16:11:46 -07:00
callum
9edcde56e9
Merge with head
2011-05-02 13:41:24 -07:00
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