livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,776 Commits
2 Branches
0 Tags
301 MiB
Commit Graph

10776 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Rick Pasetto 8841ad4794 Bump up URL entry max to 1024 
(approved by Richard)
 2010-01-20 15:37:33 -08:00
Erica 1c1f465acc EXT-4482 [BSI] People > Profile - when window is too short, scroll bar cuts off text 2010-01-20 15:36:05 -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
Brad Payne (Vir Linden) a9871e8d25 For EXT-4222: Switching outfits sometimes causes me to wear both, and show previous outfit as worn. 2010-01-20 17:59:16 -05: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
Erica 4aa7571bdb Automated merge with ssh://hg.lindenlab.com/james/gooey 2010-01-20 14:23:46 -08:00
Erica 07625b49f2 EXT-4543 Edit layout and art of chicklet button 2010-01-20 14:23:28 -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
Chuck Linden a67670dee6 Automated merge with ssh://hg.lindenlab.com/james/gooey/ 2010-01-20 15:44:54 -05:00
Chuck Linden 1f0470e334 Finished layout of appearance editor. 
http://jira.secondlife.com/browse/EXT-146
 2010-01-20 15:44:34 -05:00
Brad Payne (Vir Linden) 40b6cb7541 For EXT-4222: Switching outfits sometimes causes me to wear both, and show previous outfit as worn. Postpone appearance change until wearables have resolved. 2010-01-20 15:14:38 -05:00
Rick Pasetto 190d695828 Automated merge with ssh://richard@hg.lindenlab.com/james/gooey 2010-01-20 12:10:55 -08: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
Nathan Wilcox 5fc9d8bdda Remove a tab character from the end of a line to pass policy requirements. 2010-01-20 11:46:40 -08: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
Nathan Wilcox c1d7951ea9 Automated merge with ssh://inoshiro@hg.lindenlab.com/viewer/viewer-2-0/ 2010-01-20 11:09:56 -08: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
Nathan Wilcox ea7733a161 Automated merge with ssh://inoshiro@hg.lindenlab.com/viewer/viewer-2-0/ 2010-01-20 10:51:52 -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
Nathan Wilcox f590c3dc89 Automated merge with ssh://inoshiro@hg.lindenlab.com/viewer/viewer-2-0/ 2010-01-20 10:45:20 -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
Nathan Wilcox 14bafde851 Automated merge with ssh://inoshiro@hg.lindenlab.com/viewer/viewer-2-0/ 2010-01-20 10:27:04 -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
Rick Pasetto 927b8da7e9 Automated merge with ssh://rick@hg.lindenlab.com/rick/viewer-2-0-rickcallum 2010-01-20 09:57:19 -08:00
Rick Pasetto ae079af48d Add another setting controlling whether SLURL drag-and-drop performs a teleport 2010-01-20 09:55:36 -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
Nathan Wilcox 4928281a9c Automated merge with ssh://inoshiro@hg.lindenlab.com/viewer/viewer-2-0/ 2010-01-20 09:41:54 -08: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
Dmitry Zaporozhan 4028b720c9 Update for normal bug EXT-3749 - Clicking landmark attachment on Group notices doesn't open side panel. 
--HG--
branch : product-engine
 2010-01-20 17:17:15 +02:00
Lynx Linden f009fbcb03 EXT-4506: Remove certain accordion tab help IDs. 
...to allow us to find the various inner nested tab IDs.
 2010-01-20 14:16:24 +00:00
Dmitry Zaporozhan 5183fa51f2 Update for major bug EXT-4206 - Bottom bar spec calls for button background art on IM Chiclets. 
Adjusted chiclets height to match other bottom bar widgets height.

--HG--
branch : product-engine
 2010-01-20 14:18:28 +02:00
Dmitry Zaporozhan 284279966b Fixed normal bug EXT-4476 - Classfield appears in classfield accordeon after error message about money scarcity has been closed. 
--HG--
branch : product-engine
 2010-01-20 13:16:23 +02:00