a14172dd40
Sync with viewer-experience
2011-05-03 17:35:38 -07:00
45145fe7e2
EXP-756 : Move the folder resort to first draw and do it only once
2011-05-03 17:34:53 -07:00
9120a9bf29
merge
2011-05-03 17:16:33 -07:00
950b74c170
EXP-778 Bring up corresponding IM window on connect to new voice call.
2011-05-03 17:12:43 -07:00
8cc430f691
EXP-624 Place profile floater may be opened by SLApp
2011-05-03 17:11:58 -07:00
af6a5b1f40
FIX VWR-22337 translation (in utf-8) for "loading terms of service" string
2011-05-03 16:37:12 -07:00
b2e36e5222
Sync with viewer-experience
2011-05-03 15:35:29 -07:00
59f8a2e7a4
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
2011-05-03 15:01:15 -07:00
29a2e3f2a4
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge
2011-05-03 15:00:49 -07:00
a23ad02cf5
merge
2011-05-03 16:38:15 -05:00
1b601fbdff
EXP-771 Enable call option in Basic Viewer UI
2011-05-03 14:35:07 -07:00
84499951f2
Sync with viewer-experience
2011-05-03 13:19:17 -07:00
64b192ed62
EXP-756 : Fix inventory folder ordering on launch
2011-05-03 13:18:16 -07:00
8b4b2e375d
Fix for line endings style (dos2unix).
...
Updated header blocks for llphysicsshapebuilderutil classes.
2011-05-03 15:31:30 -04:00
76221ab9b3
FIX VWR-25074 add missing Danish translation
2011-05-03 11:55:21 -07:00
88155917e6
Automated merge with ssh://hg.lindenlab.com/nat/viewer-summary-json
2011-05-03 13:43:42 -04:00
b0ebba414e
merge fix for voice
2011-05-03 10:43:32 -07:00
f5355e9580
CHOP-599: create summary.json early enough to package with installer.
...
viewer_manifest.py will now package a summary.json file, if present; but
previously build.sh didn't create that file until after the viewer build.
2011-05-03 13:40:10 -04:00
a13541bd0f
Automated merge with file:///Users/nat/linden/viewer-summary-json
2011-05-02 21:02:53 -04:00
d5faa4f38d
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
2011-05-02 17:57:52 -07:00
8f720b59d3
CHOP-599: if build.sh creates summary.json, package it with viewer.
...
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-02 20:49:47 -04:00
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
6431f7fb28
WIP VWR-25074 add missing string in English, pending actual Danish translation
2011-05-02 17:14:53 -07:00
5b29bd3660
sync up with viewer-development
2011-05-02 17:12:16 -07:00
9a6f06687e
merge
2011-05-02 16:38:51 -07:00
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
315eee3a7c
Backed out changeset: d38e4f4982a0
2011-05-02 16:11:46 -07:00
a4e49310a5
STORM-1210 fsqrtf cleanup
2011-05-02 18:01:27 -05:00
9edcde56e9
Merge with head
2011-05-02 13:41:24 -07:00
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
c0e6d606e6
STORM-1210 : Fix python merge glitch so to pass Release build (again)
2011-05-02 15:25:24 -05:00
a25f898703
merge
2011-05-02 14:52:12 -05:00
8decd5a4e6
merge
2011-05-02 10:39:37 -04:00
50caebbad7
Added handler for final mesh object upload
2011-05-02 10:39:18 -04:00
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
4ea383b7a4
VWR-25654 FOLLOWUP Files that use curl functions should include <curl/curl.h>
...
directly, even if it already gets already included indirectly.
2011-05-01 22:08:21 +02:00
8fae347ba9
VWR-25654 FIXED memory leak in LLTranslate::getTranslateUrl
2011-05-01 22:04:06 +02:00
37084d7edb
STORM-1213 : pull from viewer-experience-merge
2011-04-29 18:04:23 -07:00
ee06fde193
Automated merge with http://hg.secondlife.com/mesh-development
2011-04-29 18:14:32 -06:00
3d64e29007
merge
2011-04-29 16:07:56 -07:00
af41eb0d2c
EXP-742 FIX [PUBLIC] CTRL-ALT-w doesn't "spin_over"
2011-04-29 15:54:45 -07:00
5fe3675564
EXP-761, EXP-758
2011-04-29 15:53:14 -07:00
Merov Linden