Commit Graph

31 Commits (1d4d4fec00aacb1e1e00a4f60a6af4d8ed3b8bde)

Author SHA1 Message Date
Steve Bennetts b8ce05ed08 merge 2009-10-22 13:10:59 -07:00
Steven Bennetts eda3c6386e Deleted some files that were deleted by PE but missed during merges.
Added some missing licensing info.
2009-10-22 05:54:50 +00:00
Rick Pasetto 628e10b080 "Fix" unit test: you can't count on timers being scheduled to not actually also fire in the same 'pump' 2009-10-13 19:56:38 -07:00
Rick Pasetto d9c1237e6f Disable boost::lexical_cast warning 2009-10-13 16:35:49 -07:00
Rick Pasetto 630e003347 Potential fix for unit test (though I can't run it :( ) 2009-10-13 13:05:19 -07:00
palange dbe7135cc4 merge of login-api 2009-10-12 19:03:52 -04:00
Rick Pasetto d4b2897700 Unit tests for LLMediaDataClient
This required a bit of refactoring of LLMediaDataClient:
- Created LLMediaDataClientObject ABC, which now has a
  concrete impl in LLVOVolume
- Created unit test with 6 tests (for now), testing
  - LLObjectMediaDataClient::fetchMedia()
  - LLObjectMediaDataClient::updateMedia()
  - LLObjectMediaNavigateClient::navigate()
  - queue ordering
  - retries
  - nav bounce back
- Also ensures that ref counting works properly (this is important, because
  ownership is tricky with smart pointers put into queues, peeled off
  into timers that fire and auto destruct, and HTTP responders that also
  auto-destruct)
- Had to fix LLCurl::Responder's stub, which was not initializing
  the ref count to 0, causing the ref counting tests to fail
  (boy, that was hard to find!).

Reviewed by Callum
2009-10-09 18:56:36 -07:00
Nat Goodspeed e3a4e3dc10 DEV-40930: Added ["change"] key to login-module status events. Changed
existing event calls to use state as "offline" or "online", with "change"
indicating the reason for this status event. Changed disconnect() to send
state "offline", change "disconnect" -- instead of replaying last auth
failure. Changed unit tests accordingly.
Changed LLLoginInstance::handleLoginEvent() to use LLEventDispatcher to route
calls to handleLoginFailure() et al.
Added LLEventDispatcher::get() to allow retrieving Callable by name and
testing for empty().
2009-10-09 19:42:59 -04:00
brad kittenbrink 902d6676c6 Post-merge cleanup to get things building again. 2009-10-07 19:26:04 -07:00
brad kittenbrink 50247533f9 Merged latest viewer/login-api with latest viewer/viewer-20 2009-10-07 17:51:28 -07:00
James Cook ada0f4fa22 Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming.
Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml

Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry
2009-10-03 23:40:28 +00:00
Nat Goodspeed a3f11b1a99 QAR-1619: spurious capitalization of Llviewerprecompiledheaders.h made Linux build fail 2009-10-02 14:03:14 -07:00
Mark Palange (Mani) 3a0a287058 Patches follow merge to latest viewer-20 updates 2009-10-02 12:59:05 -07:00
Mark Palange (Mani) 4d53e235c2 merge of latest viewer/viewer-20 2009-10-02 10:35:42 -07:00
Adam Moss feabeb4965 DEV-35039 Viewer 2.0 Help System - Viewer Development
svn merge -r134800:134805 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer2help-3
2009-09-30 17:46:31 +00: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
brad kittenbrink 8f4811f3fd Better solution for fixing up the LLFloaterTOS callback after the last viewer-2.0.0-3 merge.
LLFloaterTOS and LLLoginInstance now communicate through an event pump "lllogininstance_tos_callback".
reviewed by Mani.
2009-08-11 12:09:18 -04:00
brad kittenbrink e6c9f94438 Backed out changeset bfb246df4655: rolling back LLFloaterTOS post-merge fixups because they didn't work on linux. 2009-08-06 18:45:37 -07:00
brad kittenbrink 0bf8a15cc0 Fixups after the latest merge with viewer-2.0.0-3. Updated LLLoginInstance to use the new LLFloaterReg way of getting hold of floaters. 2009-08-05 18:39:02 -07:00
brad kittenbrink 84ec6b6925 Fixups for changest 486d51877332 merge. Deleting references to things that got deleted in viewer-2.0.0-3 2009-07-31 15:33:06 -07:00
Mark Palange (Mani) 9538328d5f Adding LLLoginInstance unit test.
- Added LLNotificationsInterface class.
 - Removed LLLoginInstance use of LLNotifications EventAPI
2009-07-24 15:08:16 -07:00
Bryan O'Sullivan baa73fddd9 Merge with viewer-2.0.0-3 branch 2009-06-22 15:02:19 -07:00
Steven Bennetts 9ec432034d merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
ignore-dead-branch
2009-06-21 08:04:56 +00:00
Christian Goetze c90c3630ab Fix one more license, add indra/newview/tests to exported tree 2009-06-04 21:18:04 +00:00
Brad Kittenbrink 087bd26553 Merge of QAR-1383 event-system-7 into trunk.
svn merge -r 121797:121853 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge-event-system-7
2009-06-04 16:24:21 +00:00
Brad Kittenbrink 01d390825a DEV-27646 dll linkage for login module.
Ok, finally got this to a point where it doesn't break the build and I can check
in. llcommon can be built as a shared library (disabled but can be enabled with
cmake cache var LLCOMMON_LINK_SHARED.

reviewed by Mani on tuesday (I still need to get his suggested changes
re-reviewed)
2009-05-22 23:27:16 +00:00
Nat Goodspeed 3975de991d svn merge -r113003:119136 svn+ssh://svn.lindenlab.com/svn/linden/branches/login-api/login-api-2 svn+ssh://svn.lindenlab.com/svn/linden/branches/login-api/login-api-3
(finish)
2009-05-13 23:35:42 +00:00
Nat Goodspeed dc93462991 svn merge -r113003:119136 svn+ssh://svn.lindenlab.com/svn/linden/branches/login-api/login-api-2 svn+ssh://svn.lindenlab.com/svn/linden/branches/login-api/login-api-3 2009-05-11 20:05:46 +00:00
Nat Goodspeed 3800c0df91 svn merge -r114679:114681 svn+ssh://svn.lindenlab.com/svn/linden/branches/event-system/event-system-7 svn+ssh://svn.lindenlab.com/svn/linden/branches/event-system/event-system-8 2009-05-08 21:08:08 +00:00
Steven Bennetts a4000c3744 merge trunk@116587 skinning-7@119389 -> viewer-2.0.0-skinning-7 2009-05-08 07:43:08 +00:00
Dave Simmons 24b26d71ee svn merge -r113004:115000 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
Merge latest 1.26 into trunk
2009-03-20 20:00:47 +00:00