Igor Borovkov
26384d7489
fixed EXT-4316 Side panel slides to the left in a newly created IM window
...
--HG--
branch : product-engine
2010-01-21 15:48:58 +02:00
Ychebotarev ProductEngine
a28be8aa2d
merge
...
--HG--
branch : product-engine
2010-01-21 15:19:27 +02:00
Ychebotarev ProductEngine
89449c3f38
fix for normal EXT-4035 Old sidepanel tab's text remains highlighted when switching to inventory sidepanel tab
...
--HG--
branch : product-engine
2010-01-21 15:17:44 +02:00
Vadim Savchuk
6e74f825be
merge
...
--HG--
branch : product-engine
2010-01-21 14:43:31 +02:00
Vadim Savchuk
267b7ad011
Merge from default branch
...
--HG--
branch : product-engine
2010-01-21 14:39:43 +02:00
Eugene Mutavchi
6cbcf63cb3
Fixed regression bug EXT-4487(Bottom bar context menu: no checkmarks)
...
--HG--
branch : product-engine
2010-01-21 14:35:21 +02:00
Dmitry Zaporozhan
30fbb126af
Update for normal bug EXT-4297 - Voice Control Panel resizing behavior.
...
Removed changes made in changeset 7982:97391caf89c3 (fixes EXT-4465(UI issue with scroll-bar in Voice Control panel)).
It is not needed anymore because auto resizing was removed.
--HG--
branch : product-engine
2010-01-21 13:52:05 +02:00
Ychebotarev ProductEngine
2cd45c80e8
fix for normal EXT-4466 Uploaded pick overlaps floater after changing of aspect ratio
...
--HG--
branch : product-engine
2010-01-21 13:09:47 +02:00
Lynx Linden
1a927f38d2
EXT-2151: Add the final (publicly-viewable) Search URL.
2010-01-21 11:07:20 +00:00
Dmitry Zaporozhan
9b1f9065f0
Fixed normal bug EXT-4297 - Voice Control Panel resizing behavior.
...
Also encreased floater minimum height to show one participant(this fixes ghost scrollbar)
--HG--
branch : product-engine
2010-01-21 13:04:45 +02:00
Ychebotarev ProductEngine
ab689479ba
fix normal EXT-4494 [BSI] Group Chat and Group Call buttons are shown even when you are not in the group
...
--HG--
branch : product-engine
2010-01-21 10:13:44 +02:00
Ychebotarev ProductEngine
f0bd24fbbd
fix build
...
--HG--
branch : product-engine
2010-01-21 09:59:25 +02:00
Nat Goodspeed
3ad613d36b
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-01-20 22:49:23 -05:00
Rick Pasetto
c47398b269
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
2010-01-20 17:40:50 -08:00
Rick Pasetto
b7742d52d9
FIX EXT-4273: Made text widget one pixel wider: that's all it took to get the entire string to fit
2010-01-20 17:40:36 -08:00
Karl Stiefvater (qarl)
c044459ead
EXT-4198 Screen goes fuzzy after inactivity
...
move disconnect rendering into render_ui
code reviewed by davep
2010-01-20 18:38:26 -06:00
Tofu Linden
6929207685
merge.
2010-01-20 16:00:14 -08:00
Tofu Linden
417f0ede41
EXT-4388 Crash in octree line segment intersection code
...
(more accurately, it was - I believe - reading over the end of a buffer in the pick-mask lookup)
reviewed by qarl.
2010-01-20 15:59:26 -08:00
Nat Goodspeed
b2d761b69f
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-01-20 18:48:34 -05:00
Rick Pasetto
e7bb883153
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
2010-01-20 15:37:40 -08:00
Rick Pasetto
8841ad4794
Bump up URL entry max to 1024
...
(approved by Richard)
2010-01-20 15:37:33 -08:00
Callum Prentice
8aadfb1cb6
Merge with tip
2010-01-20 15:30:07 -08:00
Callum Prentice
622f8b59ce
Fix for EXT-4169 - drop down menus do not working in LLQtWebKit with Qt 4.6
2010-01-20 15:27:58 -08:00
Nat Goodspeed
fd069bd02a
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-01-20 18:21:03 -05:00
Monroe Linden
20af2d325a
New mac build of llqtwebkit to fix EXT-4169.
...
This build is based on:
Commit 16264ea12f1320e25f3d4fad3a9ddd4d3f8d2e68 of http://qt.gitorious.org/~girish/qt/girishs-qt/commits/lindenqt
Revision 24ce3025f844 of https://hg.lindenlab.com/monroe/llqtwebkit-4.6/
2010-01-20 15:17:48 -08:00
Tofu Linden
56f97bce04
DEV-45319 breed a good openal for voice+audio (second try)
2010-01-20 15:02:54 -08:00
Nat Goodspeed
a0700b6a74
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-01-20 17:53:24 -05:00
Rick Pasetto
36606145ff
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
2010-01-20 14:46:32 -08:00
Rick Pasetto
4ff75762d1
FIX EXT-4052: Make sure bounceback url has a scheme
...
Review #83
The function LLMediaEntry::checkCandidateURL() assumes the URL passed
in at least has a scheme part (i.e. a ":"). This fixes the bounceBack
code to assure that.
2010-01-20 14:46:15 -08:00
Nat Goodspeed
761371f722
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-01-20 16:41:32 -05:00
Mike Antipov
7f61cde331
Reducing include dependence from the "llspeakers.h" through "llimview.h" (following by the 7d600b529ee8 commit)
...
--HG--
branch : product-engine
2010-01-20 23:28:57 +02:00
Loren Shih
fd5ee757a5
viewer2.0->viewer2.0 merge
2010-01-20 15:59:05 -05:00
Loren Shih
362f288bc6
EXT-4544 : Take out favorites autopopulation code
...
Removed autopopulation code. This has been in viewer2 for months but actually is buggy itself (i.e. didn't actually autopopulate new accounts most of the time) so it didn't manifest until recently.
2010-01-20 15:57:51 -05:00
Nat Goodspeed
df7e5dd1dc
DEV-35248: Allow NoVerifySSLCert to uniformly disable verification
...
Introduce static LLCurl SSL verification flag, default 'true', accessed by
LLCurl::setSSLVerify() and getSSLVerify().
Make LLCurl::Easy::prepRequest() check LLCurl::getSSLVerify() instead of
unconditionally setting CURLOPT_SSL_VERIFYPEER 'true'. Also set
CURLOPT_SSL_VERIFYHOST to match.
Make LLXMLRPCTransaction::Impl::init() examine LLCurl::getSSLVerify(), instead
of directly examining gSavedSettings.getBOOL("NoVerifySSLCert").
Make LLURLRequest::checkRootCertificate() set CURLOPT_SSL_VERIFYHOST as well
as CURLOPT_SSL_VERIFYPEER.
Make request() in llhttpclient.cpp (used by LLHTTPClient::getByteRange(),
head(), get(), getHeaderOnly(), put(), post(), postRaw(), postFile(), del(),
move()) pass LLCurl::getSSLVerify() to checkRootCertificate(), rather than
constant 'true'.
Make LLAppViewer::mainLoop() call
LLCurl::setSSLVerify(! gSavedSettings.getBOOL("NoVerifySSLCert"))
at the same time it calls LLCurl::setCAFile(), a comparable bit of static
setup.
2010-01-20 15:48:13 -05:00
Mike Antipov
af85ca38d9
fixed windows build (comparing BOOL & bool)
...
--HG--
branch : product-engine
2010-01-20 21:57:23 +02:00
Mike Antipov
ef68663a32
fixed Windows line end
...
--HG--
branch : product-engine
2010-01-20 21:55:38 +02:00
Eugene Mutavchi
7ea1707c6a
Fixed low bug EXT-4526 (State of Teleport History accordion is reset every time panel is opened)
...
--HG--
branch : product-engine
2010-01-20 21:27:02 +02:00
Eugene Mutavchi
8d80ba856d
Fixed normal bug EXT-4465 (UI issue with scroll-bar in Voice Control panel)
...
--HG--
branch : product-engine
2010-01-20 21:27:02 +02:00
Mike Antipov
69c803fec5
cleanning include list. rearrange the list in imview.cpp
...
--HG--
branch : product-engine
2010-01-20 21:02:41 +02:00
Vadim Savchuk
e4395ce8d3
Fixed low priority bug EXT-4525 (Warning flood: Failed to parse parameter "font_halign.")
...
It should be referenced from XML as "halign".
--HG--
branch : product-engine
2010-01-20 21:02:39 +02:00
Tofu Linden
5ca943cd02
Fix mis-spelling in notification text/name introduced from PE.
2010-01-20 11:02:20 -08:00
Tofu Linden
9ffce056cd
linden coding policy fix :(
2010-01-20 10:50:25 -08:00
Tofu Linden
9cd0436321
merge.
2010-01-20 10:45:54 -08:00
Vadim Savchuk
98d5be55d8
Fixed Linux build.
...
--HG--
branch : product-engine
2010-01-20 20:44:24 +02:00
Tofu Linden
89f460cc9e
fix build error from PE tree.
2010-01-20 10:40:44 -08:00
Bryan O'Sullivan
2d65e6295d
Convert all C++ files to Unix line endings
2010-01-20 10:35:22 -08:00
Bryan O'Sullivan
5a46b59284
Convert all XML files to Unix line endings
2010-01-20 10:25:06 -08:00
Tofu Linden
f38fa6a735
PE merge.
2010-01-20 10:13:24 -08:00
Vadim Savchuk
8758fac712
Fixed bug EXT-4369 ([BSI] Changing image in "Pick" doesn't trigger "Save Pick" button to be active)
...
* Changed the Save button to react on texture picker commit, not on selection.
* Added an optional "no_commit_on_selection" parameter to LLTextureCtrl
to commit only when user presses the OK button in the picker or changes
the texture via DnD, i.e. browsing in the picker doesn't commit.
--HG--
branch : product-engine
2010-01-20 19:49:41 +02:00
Dmitry Zaporozhan
da00631c63
Update for low bug EXT-4371 - Text from search history drop-down list merge with landmarks on 'Favorites Bar'.
...
Made border customisable in combo box.
--HG--
branch : product-engine
2010-01-20 18:21:54 +02:00