3a4f906037
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-10-29 18:18:39 -07:00
f93febc914
Merge remote repo
2009-10-29 18:16:03 -07:00
4bc4f036b2
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-10-29 18:14:52 -07:00
98a9de0687
Groups profile floatercramming
2009-10-29 18:14:19 -07:00
7f8b630253
Fix unposted bug: make sure to use the right slider control
2009-10-29 17:49:38 -07:00
8c7f5e9026
branch merge
2009-10-30 08:12:41 +08:00
c3b2f98012
media inspector https icon
2009-10-30 08:11:56 +08:00
5c4ec60c96
Fix a copy-paste error in LLPanelPrimMediaControls::postBuild().
2009-10-29 17:04:42 -07:00
c953385351
Missed the "hold the button down" case when converting horizontal scroller to use horizontal mousewheel events.
2009-10-29 16:59:34 -07:00
b4bd34bd73
Implementation for DEV-40710 - adds name of media stream to floater tools dialog.
...
Currently, this means <title> tag for Web page or movie meta-data name for QuickTime move.
2009-10-29 16:49:29 -07:00
8357fe51aa
Added LLViewerMediaImpl::scrollWheel() to route scroll wheel events through the media impl.
...
The horizontal scroll arrows in the media controls now send horizontal scrollwheel events instead of arrow keys.
2009-10-29 16:10:37 -07:00
4d1a2ef2d1
Fix for DEV-41978 (media controls URL is incorrect after whitelist bounces webpage back).
...
Added LLViewerMediaImpl::getCurrentMediaURL(), which reflects the most recent url either set with navigateTo or received from the plugin via locationChanged/navigateComplete. LLViewerMediaImpl now uses this when reload() is called.
LLPanelPrimMediaControls now uses getCurrentMediaURL() to get the url it displays in the URL input bar and opens with the pop-out control.
2009-10-29 16:09:27 -07:00
f553f7fd15
Fix signed/unsigned mismatch breaking the build.
2009-10-29 16:07:00 -07:00
a1ec40c72b
merge
2009-10-29 15:39:29 -07:00
8f8718546a
Fixed some outlines being 1 pixel away from color swatches. Not reviewed.
2009-10-29 15:37:45 -07:00
432e243e1a
EXT-1352 Add image art to floater backgrounds.
...
Implemented "legacy_header_height" hack to account for new art being 25 pixels
tall instead of legacy 18 pixels -- it auto-sizes the floaters to be taller.
Made all floaters have resize handles, just disable and make invisible if unused.
This simplifies the floater construction logic. Floater header height now lives
in floater.xml, not as a global saved setting. Reviewed with Richard.
2009-10-29 15:37:25 -07:00
b86d4b2299
Automated merge with ssh://chuck@hg.lindenlab.com/viewer/viewer-2-0/
2009-10-29 17:48:09 -04:00
622cb8c2b4
Reverted back to white dot (dot will now be colorized programmatically).
...
http://jira.secondlife.com/browse/EXT-1486
2009-10-29 17:47:17 -04:00
8bf1dd2f1b
previous checkin had a signed/unsigned mismatch. Using a cast to fix it.
2009-10-29 17:42:32 -04:00
2337735618
Merge commit.
2009-10-29 17:19:10 -04:00
0595c97f69
Fix unposted bug where current URL is not showing in the media controls
2009-10-29 14:09:13 -07:00
a36b3baa96
Automated merge with ssh://chuck@hg.lindenlab.com/viewer/viewer-2-0/
2009-10-29 16:55:20 -04:00
fea01db2cd
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
...
--HG--
branch : product-engine
2009-10-29 22:32:57 +02:00
12427e963e
Implemented major task EXT-1695 (IM window should save profile image show/hide state).
...
--HG--
branch : product-engine
2009-10-29 22:32:35 +02:00
1c0faee6e7
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-10-29 15:17:39 -04:00
011f3786b3
EXT-1947 layer visual params don't invalidate baked textures
...
cloned visual params were picking up the mIsDummy flag from their
parents. modified the createVisualParams function to reset this flag.
code reviewed by Seraph
2009-10-29 15:16:34 -04:00
65f5348997
EXT-1945 visual parameter animations broken
...
First round of fixes for trying to fix the visual param animations
Code reviewed by Seraph
2009-10-29 15:13:27 -04:00
bc9808a017
EXT-1919 Appearance editor param sliders ineffective after save
...
Visual param sliders were not being updated to affect the new wearable created
after a save was performed. Created a reset() function to do this which gets called
after the new object is created.
Code reviewed by Seraph
2009-10-29 15:12:13 -04:00
682aba9b3b
implemented task EXT-1334 Add \"Friends\" tab in Resident Chooser containing a full list of users contacts
...
--HG--
branch : product-engine
2009-10-29 21:02:47 +02:00
d28e37b9fc
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-10-29 12:00:20 -07:00
7e4394dbcd
Added dummy icons for Tattoo and Alpha textures, pushed Lis' preferences changes for EXT-1927
2009-10-29 11:58:45 -07:00
a99493e8d0
Fix for - DEV-41731 (HTTP AUTH issues).
...
Reintroduces "white-flash" but this is less important than fix for now.
Also cleaned up a code typo.
2009-10-29 11:46:32 -07:00
15687e2acd
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
...
--HG--
branch : product-engine
2009-10-29 20:29:55 +02:00
e4d03c75fb
Made toast notifications closer to spec. http://jira.secondlife.com/browse/EXT-1673
2009-10-29 14:28:12 -04:00
e724fa0ab4
Implemented major task EXT-1487 (Reimplement chat history persistence using LLSD serialization).
...
Moved loading of IM history from LLIMFloater and LLFloaterIMPanel to LLModel::LLIMSession.
Implemented disabling of saving logs if it's disabled in Preferences.
--HG--
branch : product-engine
2009-10-29 20:26:56 +02:00
95031093c7
merge changes from https://hg.aws.productengine.com/secondlife/viewer-2-0/ 3824-3835
2009-10-29 10:42:02 -07:00
7d8c41b150
Fixed normal bug EXT-1935-[BSI] Reversion - clicking on avatar name in group chat should bring up profile
...
--HG--
branch : product-engine
2009-10-29 19:20:17 +02:00
00af1cca00
EXT-384 Fix warning about "GrapicsCardTextureMemory" when opening preferences.
...
Trivial misspelling, not reviewed.
2009-10-29 10:02:54 -07:00
fb4e95f7ea
Merge after pull from viewer 2.0 changes
2009-10-29 12:49:06 -04:00
7d64c6a226
merge
...
--HG--
branch : product-engine
2009-10-29 18:10:25 +02:00
19e99af208
fix normal bug EXT-1712 Nearby Chat: change context menu for objects
...
--HG--
branch : product-engine
2009-10-29 18:09:38 +02:00
191547dcb2
merge
...
--HG--
branch : product-engine
2009-10-29 17:50:31 +02:00
8210fba25a
Fixed Low bug EXT-1079 (Buttons disappear on movement controls if switch movement mode while clashing about land)
...
- added validation if fly mode was exactly set to avatar before processing buttons visibility
--HG--
branch : product-engine
2009-10-29 17:48:12 +02:00
8298a1de68
Fixed normal bug EXT-1556(When the Navbar and Favbar are switched off, floaters still cannot be moved into the space they previously occupied)
...
--HG--
branch : product-engine
2009-10-29 17:47:09 +02:00
ea0abdac1d
IM: cleaned up includes of old im floater stuff llimpanel.h
...
--HG--
branch : product-engine
2009-10-29 16:49:06 +02:00
3a87aa6164
converted workaround to a fix for normal bug EXT-1918 (Region Messages crash the sender and anyone set busy).
...
--HG--
branch : product-engine
2009-10-29 16:33:10 +02:00
069ac005a9
Fixed 9-slice scaling on FileMenu_BarSelect for http://jira.secondlife.com/browse/EXT-1951
2009-10-29 10:33:06 -04:00
8c9819f946
Removed unnecessary string which occasionaly appeared after merge
...
--HG--
branch : product-engine
2009-10-29 16:22:56 +02:00
f04c96c540
Re-enabling an accidentally disabled test
...
--HG--
branch : product-engine
2009-10-29 15:15:17 +02:00
3f909445e1
merge
...
--HG--
branch : product-engine
2009-10-29 14:49:47 +02:00
Erica