Commit Graph

10776 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Monroe Linden 9d2102519d Fix for DEV-42400 (Mouse pointer location does not map correctly to non-square media faces). 2009-11-10 16:49:57 -08:00
Lynx Linden 34ab8e11e8 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0 2009-11-11 00:26:05 +00:00
Lynx Linden a3017978d3 DEV-41358: Added user's preferred maturity level to search URL.
The Search URL now includes a "r=" query parameter to specify the
user's preferred maturity rating. This can be "pg" or "pg,mature"
or "pg,mature,adult".
2009-11-11 00:25:33 +00:00
Nat Goodspeed ffad97ccb0 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-10 19:22:52 -05:00
Lynx Linden 2d5c6ea820 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0 2009-11-11 00:00:21 +00:00
Rick Pasetto a54fff624a Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0 2009-11-10 15:58:10 -08:00
Monroe Linden 2fd31363f7 Added PluginAttachDebuggerToPlugins debug setting.
Added accessors to get platform-specific process ID from LLProcessLauncher.

Added an optional "debug" argument to LLPluginClassMedia::init() and LLPluginProcessParent::init() (defaults to false).

Mac only: made the state machine in LLPluginProcessParent::idle() open a new window in Terminal.app with a gdb session attached to the plugin process upon successful launch.
2009-11-10 15:57:26 -08:00
Lynx Linden 434407efc4 DEV-40001: Add support for a pre-login help topic.
Asking for help (e.g., pressing F1) before logging in will now display
a specific pre-login help topic, "pre_login_help". This behavior was
agreed upon with Rand to allow us to display a custom page to help the
user log on successfully.
2009-11-10 23:56:30 +00:00
callum c50072b548 Merge with tip 2009-11-10 15:51:41 -08:00
callum 0eaf4b2bb2 Fix for DEV-42546 (QuickTime plugin crashes a lot) 2009-11-10 15:44:56 -08:00
Erica 5f5a5b12ed Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-10 15:34:16 -08:00
Loren Shih af9b99b457 EXT-2349 : Diagnose warning spam: [X] is in model and in view, but STRUCTURE flag not set
No longer allowing recursive calls to gInventory.notifyObservers.  Added debugging tools to catch when this happens.
This fixes the symptom, but we'll also need to remove whatever code is causing the recursive calls.
2009-11-10 18:30:36 -05:00
Lis Pardi 43f13cedf3 EXT-2355 Preferences: Inconsistent use of capital letters for second word of labels 2009-11-10 18:30:17 -05:00
Erica 415091d929 Added media textures to textures.xml 2009-11-10 15:26:21 -08:00
Nat Goodspeed 48163bdc5e Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-10 18:13:40 -05:00
angela 33e1cae5cc Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-11 07:08:13 +08:00
Erica bc204ef121 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-10 15:00:49 -08:00
Erica 26d848e91e EXT-2336 add new media art to viewer 2009-11-10 15:00:19 -08:00
Steve Bennetts 859c9f2565 Restore "Show Advanced Permissions" 2009-11-10 14:57:41 -08:00
Lis Pardi 02943eca33 EXT-2356 Replace Log button in bottom tray with up arrow 2009-11-10 17:55:24 -05:00
Loren Shih ae9c4e3ae9 Minor comment cleanup for llagentwearables.cpp. 2009-11-10 17:41:54 -05:00
James Cook 6c99704392 Add newline at end of file 2009-11-10 14:40:22 -08:00
James Cook bc4b49735c merge 2009-11-10 14:36:25 -08:00
Nat Goodspeed f8ddc9a8ce Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-10 17:10:57 -05:00
richard f112356d77 added filenames to xui names output when using filename="" in XUI
reviewed by Richard
2009-11-10 14:01:55 -08:00
James Cook 0f6242d9fd Sanitize naming of getWindowRect (scaled vs. raw pixels) and getWorldViewRect (scaled vs. raw)
Reduces chance of future UI bugs related to UI size.
Discussed with Richard.
2009-11-10 14:00:38 -08:00
brad kittenbrink 77f982c1a9 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0 2009-11-10 17:00:31 -05:00
Rick Pasetto 0e0fa74004 added newline at end of lluictrlfactory.cpp 2009-11-10 13:24:37 -08:00
Nat Goodspeed 7d16f84493 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-10 16:21:55 -05:00
Nat Goodspeed 65d8b9cfe5 Make LLInstanceTracker a public base of LLLayoutStack.
Qualify instance_iter with LLLayoutStack:: rather than having to restate the
template params to LLInstanceTracker.
2009-11-10 16:20:07 -05:00
Rick Pasetto 25d8cf689a further fixes in gcc land 2009-11-10 13:03:16 -08:00
Rick Pasetto caa468a5f1 fix for gcc 2009-11-10 12:58:10 -08:00
Nat Goodspeed 9630ce2f02 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-10 15:37:55 -05:00
Rick Pasetto 2420a4b90c FIX DEV-41949: LLMediaEntry::setWhitelist() and LLMediaEntry::asLLSD() have a contract conflict
Review #32

This code will go into both server 1.32 branch and the viewer branch.

As proposed in DEV-41949, I've changed setWhitelist(const LLSD &whitelist) to clear the whitelist if the WHITELIST_KEY is not present in the passed-in 'whitelist'. I've also made sure that asLLSD() ensures that the WHITELIST_KEY is erased in the given LLSD.
2009-11-10 12:29:20 -08:00
richard 595000c19c merge 2009-11-10 12:05:36 -08:00
James Cook 06fd32edf6 EXT-677 Build tool arrows work again with UI size != 1.0
Must use scaled (virtual) pixels in some computations
Will review with Richard
2009-11-10 12:04:35 -08:00
Lis Pardi ecf8f5c5be EXT-1503 Cosmetic and Polish issues with Viewer 2.0 Internal Alphan -- Notifications with long headlines are overlapping with text 2009-11-10 15:01:29 -05:00
Andrew Dyukov 2857dd026c Implemented normal task EXT-1937 (Please update landmarks and locations to the latest decided format).
--HG--
branch : product-engine
2009-11-10 21:55:50 +02:00
brad kittenbrink c9d6a4674b Merging DEV-41724/DEV-41725 3rd party lib staging work with viewer-2-0. 2009-11-10 14:45:51 -05:00
Nat Goodspeed cb6aee87d5 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-10 14:36:14 -05:00
Monroe Linden f8f8b0502e Added an explicit copy constructor to LLPluginMessage. 2009-11-10 11:30:17 -08:00
richard 1eaab29a95 merge 2009-11-10 11:26:55 -08:00
Nat Goodspeed d1e3062ae4 Merge 2009-11-10 14:26:17 -05:00
Nat Goodspeed 37806fe4b2 Reconcile LLNameListCtrl with new LLInstanceTracker interface 2009-11-10 14:23:07 -05:00
brad kittenbrink d57c20787a Fix for mac failure in apr shared lib staging (Part of DEV-41724) 2009-11-10 14:04:05 -05:00
Lynx Linden 162924aadf DEV-41317 DEV-42311: Added ad-hoc voice call support.
You can now multiple select users in the People panel, hit Call, and
start an ad-hoc voice conference call with those users.

The most difficult part here was automatically starting the call once
the conference chat panel popped up. We have to wait for the panel to
initialize before we can start a call, so I added another callback to
LLIMModel to enable us to get notified when the panel has initialized.
This is all wrapped up behind a new LLAvatarActions::startAdhocCall()
API.
2009-11-10 18:53:07 +00:00
Nat Goodspeed a97aebb84a Enhance LLInstanceTracker variants to be more uniform.
For both the (so far unused) generic KEY form and the KEY = T* form, provide
key_iter, beginKeys(), endKeys().
Change instance_iter so that when dereferenced, it gives you a T& rather than
a T*, to be more harmonious with a typical STL container. (You parameterize
LLInstanceTracker with T, not with T*.)
Fix existing usage in llfasttimer.cpp and lltimer.cpp to agree.
For the KEY = T* specialization, add T* getInstance(T*) so client isn't forced
to know which variant was used.
Add unit tests for uniformity of public operations on both variants.
2009-11-10 13:30:29 -05:00
Justin C. Rounds (Chuck) 033d61ddb3 Automated merge with ssh://chuck@hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-10 13:19:00 -05:00
Justin C. Rounds (Chuck) def4a6aeea Changed value of "Unused?" to modify highlight color.
http://jira.secondlife.com/browse/EXT-2312
2009-11-10 13:17:49 -05:00
James Cook 34bd95ff1f Don't allocate memory for debugging strings every mouse click. 2009-11-10 10:17:26 -08:00