Commit Graph

32814 Commits (680194deaf7a35caaa629abc16e886d71baff636)

Author SHA1 Message Date
Nat Goodspeed 689af4b329 DEV-38598: remove dangerous compare-LLSD-less-than operation 2009-09-12 09:11:32 -04:00
Nat Goodspeed d40d745cba DEV-38598, QAR-1619: Ensure we remove LLFloaterTOS from LLFloaterReg registry.
LLFloater's destructor calls LLFloaterReg::removeInstance() with its own name
and key. But for the new LLFloaterTOS invocation, we pass a key that's an LLSD
map. removeInstance() critically depends on LLFloater::KeyCompare::equate() --
but equate() never considered a non-scalar LLSD key value. Fortunately
llsdutil.h already provides a deep-equality function for LLSD: llsd_equals().
Making equate() trivially call llsd_equals() fixes the crash on TOS cancel.
2009-09-11 22:24:30 -04:00
Nat Goodspeed 8e0128c493 QAR-1619: Reconcile LLFloaterTOS::onCancel() with viewer-2 version.
The viewer-2 onCancel() pops up a "MustAgreeToLogIn" notification. Make ours
do the same.
2009-09-11 22:14:57 -04:00
Nat Goodspeed 08f3ea28f5 QAR-1619: Remove unneeded llfloatertos.h #includes.
Neither lllogininstance.cpp nor lllogininstance_test.cpp need llfloatertos.h
any more, since LLLoginInstance talks to LLFloaterTOS only via LLFloaterReg
and LLEventPumps. However, both sources depended on llfloatertos.h dragging in
llnotifications.h, so include that explicitly instead of llfloatertos.h.
2009-09-11 22:12:34 -04:00
Erica Olsen fc076dcfc8 EXT-562 Align title and Back button for panels to avoid "jumping" effects EXT-892 Me panel has unnecessary horizontal scroll bar EXT-869 Only top part of "Map" button is visible in Picks panel - Reviewed by Richard 2009-09-12 01:18:44 +00:00
Steven Bennetts 245172949f merge -r 1649-1651 https://svn.aws.productengine.com/secondlife/pe/stable-2@1648 -> viewer-2.0.0-3
Fixes: EXT-843 EXT-846
New Dev: EXT-514
2009-09-11 23:56:28 +00:00
Steven Bennetts 7df79382a0 merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1634 https://svn.aws.productengine.com/secondlife/pe/stable-2@1648 -> viewer-2.0.0-3
* Bugs: EXT-888 EXT-866 EXT-861 EXT-858 EXT-864 EXT-875 EXT-884 EXT-718 EXT-786 EXT-885 EXT-910 EXT-845 EXT-312 EXT-823 EXT-868
* New Development: EXT-748 EXT-863 EXT-835

QA: Please test Recent List to verify it has no troubles.
2009-09-11 23:50:59 +00:00
Erica Olsen 5644931352 EXT-921 Return Avatar Rendering Cost to topmenu 2009-09-11 21:31:36 +00:00
Loren Shih 8244288323 For DEV-39666 : Ensure AgentWearables saves actual items, not links, to database
For backwards compatibility, this change ensures that links aren't saved to user_wearable.

Reviewed by: Vir.
2009-09-11 15:06:18 +00:00
Steven Bennetts 6e1a8d894d svn merge svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1614 https://svn.aws.productengine.com/secondlife/pe/stable-2@1618 -> viewer-2.0.0-3
* EXT-895
2009-09-11 00:00:10 +00:00
Steve Linden 48328db339 #ifdef'd out gmock and gtest for LL_WINDOWS. Does not appear to be needed and breaks the build. 2009-09-10 15:36:49 -07:00
Nat Goodspeed 03a23fd244 Merge changes 2009-09-10 14:18:14 -07:00
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
Nat Goodspeed 2a446ab558 QAR-1619: move Linux SLPlugin executable to the viewer executable directory 2009-09-10 13:56:38 -07: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
Bryan O'Sullivan b253069f7e Automated merge with http://hg.lindenlab.com/viewer/viewer-20/ 2009-09-10 10:33:13 -07:00
Bryan O'Sullivan be7ac8bbfe Fix a link error with an integration test on OS X. 2009-09-10 10:31:58 -07: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
Bryan O'Sullivan 77bf10c20c Merge with SVN trunk 2009-09-09 17:11:07 -07:00
Bryan O'Sullivan a997e131d4 Merge with SVN viewer-2.0.0-3 branch 2009-09-09 17:10:06 -07: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
Bryan O'Sullivan bc1df4b1db Fix a whole bunch of compilation warnings reported by gcc 4.4 2009-09-09 20:59:38 +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
Christian Goetze 8bed0558f5 svn merge -r132747:132887 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.30
Propagate QAR-1814 to trunk.
2009-09-09 17:36:28 +00:00
brad kittenbrink 9c5cc00998 Merged parabuild work and trunk with nat's latest linux linkage and LSL tests fixes. 2009-09-09 11:43:35 -04: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
Nat Goodspeed 5669597e18 QAR-1619: reconcile Linux-specific logic in LLAppViewer::launchUpdater() with Windows and Mac 2009-09-08 16:21:03 -07:00
Bryan O'Sullivan cab31b572d Merge from trunk 2009-09-08 15:35:19 -07: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
Bryan O'Sullivan 1018b36b87 Merge 2009-09-08 14:49:49 -07:00
Bryan O'Sullivan 76001ce3f0 Merge 2009-09-08 14:28:31 -07:00
Bryan O'Sullivan 91aa2f37f4 Fix some linking problems for tests. 2009-09-08 14:24:22 -07:00
brad kittenbrink 11d10bd53a merged cg's automated build script changes into login-api 2009-09-08 16:44:38 -04: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
Bryan O'Sullivan 7ad3af45a6 Merge 2009-09-08 13:27:05 -07:00
Bryan O'Sullivan 5b428d3a63 Merge with SVN trunk 2009-09-08 12:25:35 -07:00
Nat Goodspeed 285a4173aa Merge Brad's r928694ee0b65 changes 2009-09-08 12:07:14 -04:00
Nat Goodspeed b9546a33e9 QAR-1619: Finish replacing RunBuildTest.cmake with run_build_test.py.
Because the details of RunBuildTest.cmake versus run_build_test.py had to be
changed in so many different places, introduce LL_TEST_COMMAND CMake macro (in
LLTestCommand.cmake) to encapsulate construction of the actual command line.
Use LL_TEST_COMMAND in LL_ADD_PROJECT_UNIT_TESTS, LL_ADD_INTEGRATION_TEST, the
big indra/test monolith and the various LslCompilerMacros.
Fix run_build_test.py to pass through the test executable's own options (e.g.
--touch, --output) without inspection. Defend it against the case when the
platform-specific library path environment variable doesn't yet exist. Make it
report errors only on nonzero test-program rc.
Remove RunBuildTest.cmake.
2009-09-08 12:03:32 -04:00