Commit Graph

934 Commits (9cd1efca176ebf9e2f5d5d5c1dae90d8ee017dad)

Author SHA1 Message Date
James Cook 9cd1efca17 Header file corrections to let us build without precompiled headers from llprimitive and llvfs. Allows better dependency analysis. 2009-09-10 21:15:41 +00:00
Adam Moss 03e4be4305 r128438 introduced a hilarious piece of mergefuckery about five weeks ago. eyeball this diff for a good laugh. I've verified that the evil twin is *identical*.
reviewed by palmer.
2009-09-10 20:04:37 +00:00
Adam Moss 4559c55765 revisit the fix for these:
DEV-30182 Tooltips lose their translucent background
DEV-30508 Chat bar changes from white to dark upon text entry
DEV-30830 Text color change after UI size change
DEV-30751 Create object Name text field is grey out

reviewed by Q.
2009-09-10 19:08:11 +00:00
Ramzi Ramey 3499bde10f DEV-38453 (more part 1)
- change old <combo_item> nodes to the new <combo_box.item>
2009-09-10 18:47:46 +00:00
Bradley Payne 73d152093d For DEV-34223: Avatar Pipeline Project - M6 (Current Outfit Folder, Appearance Side Panel) - brought merge branch changes from avatar-pipeline/viewer-2.0.0-3_cwf-7_merge into viewer-2.0.0-3.
svn merge -r132878:132947 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/viewer-2.0.0-3_cwf-7_merge
2009-09-10 18:42:19 +00:00
Ramzi Ramey 3dfa1e4ab9 add'l EXT-883: add a few needed tooltips to buttons on Build floater 2009-09-10 18:04:31 +00:00
Steven Bennetts ccb1d2b1e4 merge -r 1609-1612 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3
Fixes: EXT-825 EXT-893 EXT-889 EXT-88
2009-09-10 03:12:12 +00:00
Steven Bennetts 44f294d484 merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1602 https://svn.aws.productengine.com/secondlife/pe/stable-2@1608 -> viewer-2.0.0-3
* Bugs: EXT-848 EXT-865
* New Dev: EXT-790 EXT-822
2009-09-10 03:08:54 +00:00
Martin Reddy bbf497469c DEV-39537: Moved the toHTTPDateString tests into llhttpdate_tut.cpp,
as a more appropriate home. Also made use of the skip() method rather
than use printf() - thanks to tofu for the suggestion.
2009-09-09 23:58:26 +00:00
Brian McGroarty 7e43203558 Xcode 3.2 line-ending warning 2009-09-09 22:21:01 +00:00
Brad Kittenbrink 5154f4e9d2 Reenable freetype-2.3.9 for win32 (DEV-32831)
svn merge -c 131881 .

parabuild succeeded building this in branches/brad/freetype-2.3.9-upgrade/ so it had better work here...
2009-09-09 18:09:03 +00:00
Martin Reddy 58a2ba9581 DEV-39441: Removed include for boost/regex.hpp from llstring.h (and
fixed up viewer files that relied on this being included for them).
Also changed LLStringUtil::getSubstitution() to be a private method.

Reviewed by steve.
2009-09-09 11:54:23 +00:00
Martin Reddy f7231263d4 Fix for DEV-39442: Increased the performance of LLDate::toHTTPDateString
by over 50 times.

Looking at the usage, toHTTPDateStream is not called anywhere (except
internally by toHTTPDateString), and toHTTPDateString is called only
once outside of lldate.cpp, by LLStringUtil::formatDatetime. Also, the
method is most commonly called with a single two-character token, such
as "%Y" or "%A".

I therefore removed toHTTPDateStream and optimized toHTTPDateString.
Setting the locale was the most expensive operation, so I looked into
caching that, both in terms of std::ostream and strftime. The timings
for those implementations (averaged over 10 calls) is:

toHTTPDateString timings:
 - with ostream (current)                -> 0.314156 ms
 - with ostream and std::locale caching  -> 0.033999 ms
 - with strftime and setlocale() caching -> 0.005985 ms

I therefore went with the standard C library strftime solution.

I also wrote a few unit tests to make sure that I didn't break any
existing functionality, and tested this under Windows and Linux.

Reviewed by steve.
2009-09-09 10:21:58 +00:00
Jiao Li bc106b1b4b fix media test app -- reviewed by james 2009-09-09 07:26:56 +00:00
Steven Bennetts 4601aef70a merge -r 1586-1593 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3
Fixes: EXT-839 EXT-859 EXT-868 EXT-795 EXT-861 EXT-678 EXT-848 EXT-873
2009-09-09 04:27:06 +00:00
Steven Bennetts 579d8447d3 merge merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1581 https://svn.aws.productengine.com/secondlife/pe/stable-2@1585 -> viewer-2.0.0-3
* Bugs: EXT-838 EXT-815 EXT-872
* New Dev: IM Floater Docking
2009-09-09 04:12:50 +00:00
Erica Olsen bc022a0460 EXT-883 Match build tools to 2.0 visual style 2009-09-09 02:56:47 +00:00
Richard Nelson 58bce2d205 merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1 2009-09-09 01:26:44 +00:00
James Cook a67d2dd1a4 Remove llfasttimer.h from linden_common.h, not necessary and adds 15K lines of header code to every library .cpp file. 2009-09-08 22:09:11 +00:00
Kurt Stauffacher 2ed83382a1 Floatercram the Report Abuse floater to fit in the side tray. EXT-756 2009-09-08 20:39:42 +00:00
Martin Reddy b86d7cbc12 Fix deprecated conversion from string constant to ‘char*’ warnings
that occur under gcc 4.3 for DEV-39457. This fixes the indra/test
C++ unit tests under Linux.
2009-09-08 09:07:57 +00:00
Steven Bennetts 79653dfed4 merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3
* Bugs: EXT-807 EXT-810 EXT-811 EXT-784 EXT-820 EXT-393 EXT-826 EXT-811 EXT-801 EXT-808 EXT-393 EXT-743 EXT-699 EXT-397 EXT-812 EXT-736 EXT-744 EXT-809 EXT-306 EXT-854 EXT-857 EXT-790
* New Dev: EXT-694 EXT-393 EXT-367 EXT-819 EXT-795 EXT-827 EXT-788
* EXT-272 - Draggable Landmarks
* EXT-715 - Block List Panel
* EXT-782 - Implement advanced place information accordions
2009-09-07 22:55:07 +00:00
Christian Goetze a9b2296b2b svn merge -r132705:132723 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3-stable
propagate the changes to make stabel build back down.
2009-09-07 07:56:10 +00:00
Steven Bennetts ad169d3f54 DEV-39508 = Show Tools ("Build") menu by default
* Also eliminated some unused settings
2009-09-04 23:55:15 +00:00
Martin Reddy f929ec2d64 Fixed the Linux build of viewer-2.0.0-3.
- Updated linux_updater for new LLStringUtil::getTokens() signature
- Ignore compiler warning for string constants not being referred to
  as const in fmod_error.h

Fix for DEV-39457. Reviewed by moss.
2009-09-04 17:05:31 +00:00
Martin Reddy 92cccb9790 Reorder some of the new LLStringUtil methods introduced in DEV-39441
to avoid specialisation after instantiation build errors on Mac and
Linux.
2009-09-04 14:02:46 +00:00
Martin Reddy 330840af7c Merging the SLURLs Everywhere branch (viewer-2.0.0-slurls-3) into
Viewer 2.0 (viewer-2.0.0-3). This provides support for clickable Urls
in text editors and textboxes, with right-click context menus,
tooltips, and alternate link labels. This includes alert boxes, the
login progress window, local chat and IM interfaces, etc. As well as
context menus for avatars and groups in list widgets. Includes fixes
for the following individual JIRAs:

DEV-8763 VWR-10636: Hyperlinks in alert dialogs should be selectable (clickable)!
DEV-38829 EXT-742: Remove LLLink class
DEV-35459 VWR-14679: SLURLs and teleport Links not parsed properly
DEV-19842 VWR-8773: Closing parenthesis ")" breaks urls
DEV-21577 VWR-9405: In-world SLURLs containing "(" or ")" are not treated as a hyperlink in chat
DEV-37652 SEC-435: Object Chat/IMs are untraceable (VWR-2388) Fix has left flaw
DEV-10353: URLs in chat log terminated incorrectly when newline in chat
DEV-2925: In chat history, use a teleport hyperlink as source name for object IMs
DEV-36192: Need a way to copy Avatar names and Group names
DEV-2926: Allow viewer hyperlinks to have different text than the actual url
DEV-27253: Add easy way to copy URLs from viewer chat
DEV-38274: Make About Second Life window use new Url hyperlinking features
DEV-39076: No url support in Text Editors
DEV-7476 VWR-2172: Add hyperlinks to chat console for easier access
DEV-7475: Add hyperlinks to notecards!
DEV-35375 EXT-128: HTTPS urls aren't loaded in the internal browser by click

Master JIRA issues: DEV-32819, DEV-323820, DEV-7474

Testing performed against QAR-1789

svn merge -r 131623:131889 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-slurl-3
svn merge -r 131978:132515 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-slurl-3
2009-09-04 12:11:27 +00:00
Steven Bennetts 2273376dff DEV-39441 - Eliminate boost:regexp from LLString::format
Also removed a missing setting (merge bug)
2009-09-04 00:16:51 +00:00
Ramzi Ramey f03db936f8 DEV-39252 add 3 missing name= elements in the EN xui. This breaks localization. 2009-09-03 23:53:47 +00:00
Brian McGroarty ae6c3d7d6c build issue - const invariance in llplugintest/llmediaplugintest 2009-09-03 02:57:14 +00:00
Ramzi Ramey 295dfd4351 DEV-31909 Revise strings.xml used in LSL editor hovertips
We are not going to use \n in the XML to refer to a newline in the official viewer. I changed these to a real CRLF.
2009-09-03 00:20:39 +00:00
Brian McGroarty 22bbba4dd4 DEV-39355 Remove ctrl-alt-V shortcut for View Admin Options 2009-09-02 23:06:00 +00:00
Ramzi Ramey c0681e561a DEV-38453 (part 1)
- need to refer to the correct button in the help text for new Pref > Graphics layout
- need to rename nodes in Pref > General that have the OPPOSITE meaning as viewer 1.23; we intentionally want to disconnect these from their prior, opposite translation
2009-09-02 21:11:44 +00:00
Kurt Stauffacher 1f881a743a Update XUI for Me Pick Info and Me Edit Edit Pick Info panels in sidetray to match updated style guide. EXT-805 2009-09-02 18:09:50 +00:00
Steven Bennetts 5612f13dc8 merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1516 https://svn.aws.productengine.com/secondlife/pe/stable-2@1526 -> viewer-2.0.0-3
* Bugs: EXT-622 EXT-702 EXT-626 EXT-638 EXT-600 EXT-543 EXT-656 EXT-801
* New Dev: EXT-282 EXT-782 EXT-694 EXT-797 EXT-798 EXT-799 EXT-453
2009-09-02 02:59:07 +00:00
Steven Bennetts 1a5cb4fbfb Made floater_media_browser.xml a single instance. 2009-09-02 02:01:55 +00:00
Ramzi Ramey 02a1b5ea08 DEV-39252 fix duplicate name= elements in the EN xui. This breaks localization, please dont do it. 2009-09-01 18:40:07 +00:00
Bryan O'Sullivan 3e5819d862 Trivial commit for hg import purposes 2009-09-01 18:01:40 +00:00
Bryan O'Sullivan 359fb94741 Sync up with a number of SVN changes that snuck in via weird merges 2009-09-01 11:04:15 -07:00
Nat Goodspeed 3069355a6f DEV-34522: [COMMENTS ONLY] clean up comments about (formerly) disabled tests 2009-09-01 14:41:04 +00:00
Christian Goetze cbad737f59 Fix syntax error introduced by your's truely into develop.py 2009-09-01 01:46:05 +00:00
Steven Bennetts 778b893212 EXT-791 - Add "Pause Agent" option to the Debug > Network menu 2009-09-01 01:03:51 +00:00
Christian Goetze 01d957c3e4 Add retry logic on certain exit codes 2009-09-01 00:55:00 +00:00
Kurt Stauffacher e20ac4718e Updated Me Profile and spec generated by 80/20. Removed Edit options for public profile display. Description of task in EXT-770 2009-08-31 23:28:56 +00:00
Sam Kolb 410e2228fd Removed some final dependencies to Awesomium and Flash ActiveX (mostly porting over Callum's change: r132166)
DEV-39138 build process on parabuild fails due to missing flash activex plugin
2009-08-31 23:08:06 +00:00
Erica Olsen 5e7034a53b EXT-785 Remove old art resources from viewer 2009-08-31 22:39:14 +00:00
Adam Moss 3ac3a4b206 sheesh, finish(?) gutting the flash stuff out of DEV-31438 2009-08-31 18:46:54 +00:00
Kurt Stauffacher e77338c956 Updated Me Profile and Me Edit Profile xml files to match new spec generated by 80/20. Description of task in EXT-770 2009-08-31 17:46:13 +00:00
Adam Moss 158946668a svn merge -r130875:131962 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05_newllqtwebkit
DEV-31438 Rename LLMozLib (Qt/WebKit) to something else - LLQtWebKit
2009-08-31 17:16:21 +00:00
Erica Olsen 6dbef5f2a4 Standardized layouts, changed commitment model labels to ok/cancel, modernized advanced floaters. 2009-08-31 05:21:50 +00:00