Commit Graph

83 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Roxie Linden 0ffba7c663 automated merge 2010-05-27 22:58:40 -07:00
Roxie Linden cf05f59dd9 EXT-7388 - --grid command-line argument does nothing
Fix up overriding of --loginuri --loginpage --helperuri
2010-05-27 17:20:29 -07:00
Roxie Linden 1f101ee2a3 EXT-7388 - --grid command-line argument does nothing
QAR-3119 --grid command-line argument does nothing

Made --grid specifier case insensitive.
Fixed some issues with specifying non-well-known-grids
Fixed some issues with specifying --loginuri, --loginpage and --helperuri
2010-05-27 11:52:39 -07:00
karina cca5aa48ae Add new mechanism for getting a unique machine id. 2010-05-26 23:46:42 -07:00
Roxie Linden 32ad37b3f7 Few more touchups for the cert performance code 2010-05-24 16:21:29 -07:00
Roxie Linden a7d1c68c78 Fixup some certificate related unit tests 2010-05-24 15:31:10 -07:00
Roxie Linden 1ad46b5cd0 DEV-50173 - investigate certificate code performance
DEV-50166 - LLBasicCertificateChain::validate calls in log
Added caching of certificates that have been validated.
The sha1 hash for the certificate is stored and is associated
with the from and to times.  When the certificate is validated,
the code determines whether the certificate has successfully
been validated before by looking for it in the cache, and then
checks the date of the cert.  If that is successful,
the validation calls with success.

Otherwise, it proceeds to do a full validation of the certificate.
2010-05-24 13:59:10 -07:00
Roxie Linden 75755a6751 Add missing debug grids 2010-05-18 15:56:42 -07:00
Roxie Linden 2173bb5f6a Add test for sha1WithRSAEncryption signed certs. Also removed redundant openssl initialization 2010-04-29 02:07:12 -07:00
Roxie Linden d82a10217a Fix issue parsing wildcard cns in certificates
CR: Karina
2010-04-26 17:41:21 -07:00
Roxie Linden b0473a8d47 Fix test build break 2010-04-22 16:30:50 -07:00
Roxie Linden 5e727964db DEV-49332 - cryptic error message when typing in single username when logging into maingrid.
Needs to be changed when IE is checked in, of course.

Now we check the expected credential formats for a given grid against the
format that is typed in, and throw an error if it's invalid.
2010-04-22 15:09:34 -07:00
Roxie Linden 9fdba53b09 Show beta grids depending on a settings.xml setting. for SLE, this will be turned off. For trunk, it's turned on.
Also, fixed an issue with manual entry of locations into the location dropdown.
2010-04-21 00:17:58 -07:00
Roxie Linden 658ccc3e85 Re-insert backed out SLE checkin so we can fix it 2010-04-07 11:08:04 -07:00
Tofu Linden 0bb3f144c0 Backed out changeset 63b699f90efd 2010-04-07 10:37:07 +01:00
Roxie Linden 1147cb1afb Automated merge from trunk 2010-03-01 18:09:04 -08:00
Roxie Linden b11a625e6f Automated merge with a few fixups for code review comments 2010-03-01 15:31:04 -08:00
Tofu Linden b20307a683 Hopefully fix this test case after the EXT-5820 fix 2010-02-28 09:28:00 +00:00
Roxie Linden a2efe4bb41 automated merge 2010-02-26 19:18:15 -08:00
Roxie Linden 5352954eb6 automated merge 2010-02-26 17:34:39 -08:00
Roxie Linden 5c73a90835 automated merge 2010-02-25 21:20:45 -08:00
Roxie Linden c6163fafaa automated merge 2010-02-25 01:34:52 -08:00
Roxie Linden 0bf246ed66 Automated merge 2010-02-25 00:17:42 -08:00
Mark Palange (Mani) 0b450b6003 Changing viewer unit test licenses to viewergpl 2010-02-12 16:32:28 -08:00
Tofu Linden fd5af776d9 CID-319
Checker: UNINIT_CTOR
Function: LLViewerLogin::LLViewerLogin()
File: /indra/newview/tests/lllogininstance_test.cpp
2010-01-29 15:00:29 -08:00
Tofu Linden d477b83325 CID-328
Checker: UNINIT_CTOR
Function: LLAgent::LLAgent()
File: /indra/newview/tests/llviewerhelputil_test.cpp
2010-01-29 14:43:46 -08:00
Lynx Linden 988cc62d30 EXT-4340: Fixed llviewerhelputil_test.cpp on Linux.
The gcc compiler will strip out the stubbed isGodlike() method under
an optimized build. There's no way to stop this without either putting
the definition in another cpp file, which is hard to do with our unit
test infrastructure, or disabling gcc's inlining of the method. So I
did the latter, using __attribute__ ((noinline).
2010-01-15 19:25:42 +00:00
Lynx Linden 30c5d4477c EXT-4340: Fixed and re-enabled the llviewerhelputil unit test. 2010-01-15 00:39:16 +00:00
James Cook 68aa898f6c Better unit test for date math, works on PC but system problem on Mac/Linux 2010-01-05 13:02:06 -08:00
Lynx Linden 870d4449f5 EXT-3441: Support various substitutions for Search URL.
The search URL is now specified in app_settings/settings.xml (instead
of in floater_search.xml), and it is now defined more flexibly with
support for various substitution strings, such as [QUERY], [AUTH_KEY],
[MATURITY], [GODLIKE], etc.

I pulled the common substitution code out into a new static method,
LLWeb::expandURLSubstitutions(). This provides support for common
strings like [VERSION], [CHANNEL], [LANGUAGE], [OS], etc. The Help and
Home sidetray code has been updated to use this new function, to avoid
replicating this behavior 3 times.

I also cleaned up the app_settings/settings.xml file and removed the
old search keys of: SearchURLDefault, SearchURLQuery, and
SearchURLSuffix2.
2009-12-15 16:00:28 +00:00
brad kittenbrink e8c150b6b1 Yet again more fixups for compile errors after the last merge... 2009-12-14 16:34:20 -08:00
Rick Pasetto 2d01d763d5 PARTIAL DEV-43869 - add "isInterestingEnough()" to the queue calculation
This change bumps the queue sizes way up, because we
think that the "isInterestingEnough()" call will prevent
loading more media data than we think is necessary.
Still need to implement it in LLVOVolume, though
2009-12-10 17:03:40 -08:00
Rick Pasetto 248427b8f9 PARTIAL DEV-43869: LLMediaDataClient now uses two queues
This is a fairly major change that addresses the issue of an object
with constantly-updating media.  Before, that object would be put
into our single queue and sorted to a particular spot, and since it
continuously updates, it would "always be there".  That means that
nothing "behind" it would ever get serviced.

This change introduces two queues for each MDC: one is the same
"sorted" queue as before, and the other is unsorted, and
"round-robins".  New objects go into the sorted queue, objects
whose media we already know about get put into the unsorted queue.
The two queues are interleaved when serviced (one then the other is
serviced -- if one is empty we try the other -- until they are both
drained).

The round-robin queue works a little differently: after an item is
fetched from that queue (remember this would be an item we already
know about), that request is marked and put back at the end of the
queue.  If that object gets a UDP update while in the queue, that mark
is "cleared".  When it gets to the front of the queue again, if it
still marked, it is thrown away.  If it is not marked, it is fetched,
and again marked and put at the end.  This makes the queue
self-limiting in how big it can get.

I have also made some other changes:
- The sorting comparator now just delegates to the object for its
"interest" calculation.  A higher value = more interesting.
LLVOVolume now uses its PixelArea for its "interest" calculation,
which seems apparently better (the prior distance calculation was
wrong anyway).
- The score is cached before the sort operation is performed, so that
it won't be expensive to sort
- Now, the media version that is fetched is saved in the LLVOVolume,
and we do not update if it is not newer (this is not very
useful...yet.)
- I've introduced hard limits (settable by debug settings) on the size
of the queues.  The sorted queue will be culled (after sort) to that
count. NOTE: this will probably get removed in a later checkin, as
I've already gotten feedback that this is not desirable
- I've reorganized LLMediaDataClient so it makes more sense.
- I've made the request object a little smaller, so the queue won't take up so
much memory (more work could be done here)
- Added a unit test for the two-queue case (though more tests are needed!)
2009-12-10 14:21:48 -08:00
Lynx Linden 98111a40ec DEV-43439: Created new LLVersionInfo API.
Renamed llviewerversion to llversioninfo, to avoid confusion with
llversionviewer in llcommon (llversion is already used by llwindow).

Created new LLVersionInfo class with the following methods:

        static S32 getMajor();
        static S32 getMinor();
        static S32 getPatch();
        static S32 getBuild();
        static const std::string &getVersion();
        static const std::string &getShortVersion();
        static const std::string &getChannel();

All viewer code has been updated to use this API. Viewer code no
longer directly includes llversionviewer.h from llcommon.
2009-12-08 14:56:19 +00:00
Lynx Linden 24cba353a4 DEV-43439: Rename llviewerbuild.{cpp|h} -> llviewerversion.{cpp|h}
This module now contains general viewer version routines, not just
access to the viewer build number, so I've renamed it from
llviewerbuild to llviewerversion.
2009-12-07 20:30:29 +00:00
Lynx Linden de2f8212f0 DEV-43439: Added calls to query the viewer version.
Rather than copy/paste the same version string formatting pattern
again, I added new string-based version routines:

/// return the full viewer version as a string like "2.0.0.200030"
const std::string &llGetViewerVersion();

/// return the viewer version as a string like "2.0.0"
const std::string &llGetViewerShortVersion();

/// return the viewer build version as a string, e.g., "200130"
const std::string &llGetViewerBuildVersion();
2009-12-07 20:05:52 +00:00
Rick Pasetto f276b73d97 DEV-41998 - refactor mediadataclient to use a std::list, and re-sort every time an item is pulled off the queue
Review #43

This change refactors mediadataclient to no longer use a PriorityQueue (which sorts only on insertion), but rather just use a std::list which is re-sorted on insert, and also when "popped" (at the time the queue timer goes off).

Also implemented a unit test to make sure re-sorting occurs on timer tick.
2009-11-24 14:26:00 -08:00
James Cook fc04d5bbb8 merge 2009-11-20 09:46:23 -08:00
Monroe Linden ba3f7965e3 Made LLMediaDataClient not send requests on behalf of objects that are marked as dead.
When LLMediaDataClient::QueueTimer::tick() encounters an object at the head of the queue that's dead, it will now remove that object and loop, instead of sending a request and waiting for the tick timer to fire again.

Added an isDead() function to LLMediaDataClientObject, and an additional unit test that verifies the handling of dead objects.
2009-11-19 16:35:11 -08:00
James Cook 7ab6dc37f8 EXT-1743 People inspectors should show Age, not Date born, fixed date math
Changed date math to correctly account for month lengths and leap years.
Extended unit test.
Review pending.
2009-11-18 19:21:09 -08:00
Mark Palange (Mani) a5f6da0975 merge 2009-11-12 09:26:54 -08:00
Mark Palange (Mani) 51e3a486c6 Changes to fix an LLERRS caused by SRV request timeout.
Added settings to config SRV request params
Increased timeout to 10 seconds
Changed timeout to generate login failure event instead of an error.
Added unit test to cover SRV failure event.
2009-11-11 14:28:40 -08:00
Rick Pasetto 353ac3969e FIX DEV-41991: do not allow media settings panel to come up if media data is in flight
Review #33

This change marks the current selection "not editable" if
any objects in the selection are currently "in flight" (i.e.
their media data has not been fetched yet, or is in the
process of being fetched).  This involved adding API to
LLMediaDataClient to query whether an object is in the
process of being fetched (i.e. in the queue).  I've added
a unit test for this new API.
2009-11-10 17:24:02 -08:00
Steve Bennetts afe6350160 merge from texture-pipeline 2009-11-06 12:15:41 -08:00
Xiaohong Bao 35e200881c merge QAR-1829: texture pipeline branch in viewer-2.0.0.3 2009-11-06 06:52:24 +00:00
Loren Shih 0dd9871012 merge
--HG--
branch : avatar-pipeline
2009-11-03 14:02:02 -05:00
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