3cfd8a7ae8
adding warning msg when fetching for folders with NULL uuid
2009-11-11 14:34:00 +08:00
37ac878ec0
Fix for Windows compile error.
2009-11-10 19:52:58 -08:00
28f7977d6f
merge
2009-11-10 19:42:07 -08:00
68d6dffff3
Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/
2009-11-11 11:35:12 +08:00
8ec85a68ac
Fix for DEV-42328 (Muting then Unmuting All Nearby Media resets nearby media to Home URL).
...
Fixed by having LLViewerMedia::updateMediaImpl() copy the media entry's current URL into the media impl's mMediaURL in the case where the impl has a non-empty media URL but the function doesn't do a navigate.
2009-11-10 18:47:03 -08:00
1fb3bfea28
Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/
2009-11-11 10:00:54 +08:00
98ca90bed4
Merge changes from product-engine
2009-11-10 17:52:28 -08:00
04eaf3f34f
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
2009-11-10 17:28:19 -08:00
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
88b937d65c
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-11-10 17:17:44 -08:00
e2a0e9426f
pushing changes to named font sizes prior to hardcoded font removal
2009-11-10 17:17:26 -08:00
7eff61af30
merge
2009-11-10 17:12:29 -08:00
d181b84dfd
EXT-1478 Tool-tip background and border colors are being ignored
...
EXT-2082 Multifloater preview tab container extends outside window border
EXT-773 odd notecard behaviour on closing an unsaved notcard
reviewed by Richard
2009-11-10 17:10:47 -08:00
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
34ab8e11e8
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2009-11-11 00:26:05 +00:00
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
2d5c6ea820
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2009-11-11 00:00:21 +00:00
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
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
c50072b548
Merge with tip
2009-11-10 15:51:41 -08:00
0eaf4b2bb2
Fix for DEV-42546 (QuickTime plugin crashes a lot)
2009-11-10 15:44:56 -08:00
5f5a5b12ed
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-11-10 15:34:16 -08:00
43f13cedf3
EXT-2355 Preferences: Inconsistent use of capital letters for second word of labels
2009-11-10 18:30:17 -05:00
415091d929
Added media textures to textures.xml
2009-11-10 15:26:21 -08:00
33e1cae5cc
Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/
2009-11-11 07:08:13 +08:00
bc204ef121
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-11-10 15:00:49 -08:00
26d848e91e
EXT-2336 add new media art to viewer
2009-11-10 15:00:19 -08:00
859c9f2565
Restore "Show Advanced Permissions"
2009-11-10 14:57:41 -08:00
02943eca33
EXT-2356 Replace Log button in bottom tray with up arrow
2009-11-10 17:55:24 -05:00
6c99704392
Add newline at end of file
2009-11-10 14:40:22 -08:00
bc4b49735c
merge
2009-11-10 14:36:25 -08:00
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
77f982c1a9
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2009-11-10 17:00:31 -05:00
25d8cf689a
further fixes in gcc land
2009-11-10 13:03:16 -08:00
caa468a5f1
fix for gcc
2009-11-10 12:58:10 -08:00
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
595000c19c
merge
2009-11-10 12:05:36 -08:00
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
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
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
c9d6a4674b
Merging DEV-41724/DEV-41725 3rd party lib staging work with viewer-2-0.
2009-11-10 14:45:51 -05:00
f8f8b0502e
Added an explicit copy constructor to LLPluginMessage.
2009-11-10 11:30:17 -08:00
1eaab29a95
merge
2009-11-10 11:26:55 -08:00
d57c20787a
Fix for mac failure in apr shared lib staging (Part of DEV-41724)
2009-11-10 14:04:05 -05:00
033d61ddb3
Automated merge with ssh://chuck@hg.lindenlab.com/viewer/viewer-2-0/
2009-11-10 13:19:00 -05:00
def4a6aeea
Changed value of "Unused?" to modify highlight color.
...
http://jira.secondlife.com/browse/EXT-2312
2009-11-10 13:17:49 -05:00
34bd95ff1f
Don't allocate memory for debugging strings every mouse click.
2009-11-10 10:17:26 -08:00
ebbca6470a
merge
...
--HG--
branch : product-engine
2009-11-10 20:13:17 +02:00
2fe083d36a
Minor develop.py tweaks to make mac logs more readable in parabuild output.
...
Supressing all the setenv spam.
2009-11-10 12:58:22 -05:00
42dc307954
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
2009-11-10 09:41:19 -08:00
angela