Commit Graph

9757 Commits (28d4fe68f8a44924df294473471b47ccb11a2eb1)

Author SHA1 Message Date
Xiaohong Bao 28d4fe68f8 Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public 2010-05-21 18:12:38 -06:00
Xiaohong Bao 81e6f6131b EXT-7394: FIXED: Trees have more polys at low detail than at high detail. 2010-05-21 18:04:32 -06:00
Monroe Linden 79f697ad51 Fix for EXT-5667 (support window.open() in shared media so google docs will work).
Moved the processing of clicks on _external and _blank targeted links from LLMediaCtrl to LLViewerMediaImpl.

Removed LLMediaCtrl::setOpenInExternalBrowser() since that functionality is available through the use of the _external target attribute in web content.

Removed LLMediaCtrl:: setOpenInInternalBrowser() since it was unimplemented and not used.

Made the webkit media plugin set llqtwebkit's window open behavior to WOB_SIMULATE_BLANK_HREF_CLICK.  This is #ifdefed out on Linux until we get a new Linux build of llqtwebkit.
2010-05-21 15:36:12 -07:00
Callum Prentice 9add3aa8cb Fixed Windows line endings that crept in 2010-05-21 15:27:27 -07:00
Callum Prentice ba9c64d2bb Merge 2010-05-21 15:23:36 -07:00
Callum Prentice d84990307b VI-65 - Addition of Quick/Eazy Buy Web based floater.
Switched off by default for now until Web content ready - turn on with Debug Settings - 'QuickBuyCurrency'
Reviewed by Sam/Richard
2010-05-21 15:22:32 -07:00
Tofu Linden df9e11b232 merge. 2010-05-21 22:43:09 +01:00
Nyx (Neal Orman) cde6608d0e Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public 2010-05-21 17:03:02 -04:00
Nyx (Neal Orman) f91481c82f EXT-7209 EXT-7366 FIX avatar needs to enter "appearance editing" mode
Avatar now enters "appearance editing" mode when opening the outfit or
wearable editors in the sidepanel. Changed code to ensure we don't
accidentally switch out of it and back in when switching from one to the other.

Note that this cuts out LLFLoaterCustomize from being built and shown to the user
from any UI. The code for this (and related classes) will be removed once we have
pulled any code out of it that we still need. The current outfit and wearable
editors should be working sufficiently for most purposes. Bugs should be reported
to Nyx Linden or the avatar team.

Code reviewed by Vir
2010-05-21 17:02:53 -04:00
Xiaohong Bao 517e8914f8 More for EXT-7309: Investigate turning RenderAvatarMaxVisible down to 1 or 2 on low end hardware.
set RenderAvatarMaxVisible to be 3 by default for low-end settings.
2010-05-21 10:15:56 -06:00
Tofu Linden 0e545644e1 Updated Linux build of llqtwebkit, adding some support we'll need to fix EXT-5667 (support window.open() in shared media so google docs will work). 2010-05-21 13:06:53 +01:00
Tofu Linden 9eaf8eaf72 merge from PE's viewer-trunk 2010-05-21 10:31:53 +01:00
Eli Linden 563c80d281 EXT-7288 WIP IT remove some overrides 2010-05-20 17:02:39 -07:00
Eli Linden 05a6ef7659 EXT-7287 FIX IT remove override 2010-05-20 16:42:34 -07:00
Xiaohong Bao 1162345378 More for EXT-7309: Investigate turning RenderAvatarMaxVisible down to 1 or 2 on low end hardware.
adjust the arrangements of the panel "preferences -> graphics -> Advanced".
2010-05-20 17:31:27 -06:00
Xiaohong Bao b8fa70502c Merge 2010-05-20 14:38:37 -06:00
Xiaohong Bao 46309f558e EXT-7309: PARTIAL FIXED: Investigate turning RenderAvatarMaxVisible down to 1 or 2 on low end hardware.
added a slider in "preferences -> graphics -> Advanced" to change RenderAvatarMaxVisible value.
2010-05-20 14:33:11 -06:00
Xiaohong Bao f9dd340de5 Merge 2010-05-20 14:21:09 -06:00
Roxie Linden 5e353cbf86 automated merge 2010-05-20 11:48:47 -07:00
Andrew Polunin 53505bd225 EXT-7223 FIXED (Add \"Shop\" Button in bottom of Inventory panel)
- Added 'MarketplaceURL' setting in settings.xml to represent URL which points to the Marketplace.
- Added member mShopBtn in the class LLSidepanelInventory.
- Added handler LLSidepanelInventory::onShopButtonClicked() which handles a click on the 'Shop' button
- Added corresponding widget in the sidepanel_inventory.xml

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/408/

--HG--
branch : product-engine
2010-05-20 21:16:16 +03:00
Sergei Litovchuk ae6c2de1e3 EXT-5666 FIXED Changed clicked attachment color.
--HG--
branch : product-engine
2010-05-20 18:57:29 +03:00
Mike Antipov c3a352b219 EXT-7371 FIXED Improved new state handling in p2p Voice channel to process session leave event correctly.
Reason:
* when user leave a p2p voice session himself the session's voice channel is marked as "ignore next leave session event"
* but when he re-starts the voice session the channel stays in "ignore next leave session event" state.
So, when an other p2p participant ends call this voice channel is not deactivated because of this flag.

Fix: reset "ignore next leave session event" flag to FALSE when viewer is joining p2p voice session.

Reviewed by Aimee Walton at https://codereview.productengine.com/secondlife/r/418/

--HG--
branch : product-engine
2010-05-20 17:33:26 +03:00
Yuri Chebotarev f64049c5d8 merge
--HG--
branch : product-engine
2010-05-20 16:59:36 +03:00
Yuri Chebotarev 55e26cf056 ext-7403 fix - reset all data before setting new group id
reviewed by Vadim Savchuk https://codereview.productengine.com/secondlife/r/419/

--HG--
branch : product-engine
2010-05-20 16:58:20 +03:00
Yuri Chebotarev 265f77747f EXT-6598 FIX Handle tooltip message for separator
reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/417/

--HG--
branch : product-engine
2010-05-20 16:55:06 +03:00
Mike Antipov c75225bcb9 EXT-7104 WIP Enable Build button and set necessary callbacks.
Because it is not enough to call showInstance for Build Floater it was implemented in a such way:
* set save_visibility==true in floater tools to update button toggle state properly and subscribe Build button to listen visibility changes
* added callback to observe parcel changing to set build button enabled/disabled.

KNOWN ISSUE:
if build permissions are changed button will not change state until restart/teleport

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/413/

--HG--
branch : product-engine
2010-05-20 16:51:35 +03:00
Alexei Arabadji 5ba494c4fa EXT-7363 FIXED Provided passing owner ID through chat object since it is necessary to correctly build objectim SLURL when chat history reloads content.
reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/420/

--HG--
branch : product-engine
2010-05-20 16:47:33 +03:00
Alexei Arabadji 6175738394 EXT-7391 FIXED Removed redundant responder functor setting that cause assertion.
reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/409/

--HG--
branch : product-engine
2010-05-20 16:41:34 +03:00
Tofu Linden be20b12c5c kill dos line-ending. 2010-05-20 12:52:55 +01:00
Andrew Dyukov 44c919dc38 EXT-7405 FIXED Changed "left" to "right" in text of tooltip.
Trivial fix, so not reviewed.

--HG--
branch : product-engine
2010-05-20 14:45:50 +03:00
Andrew Dyukov 49a79a3f68 EXT-7200 FIXED Integrated art missing from appearance.
Most changes are in xml, but changing of view buttons overlay icons in lists from add wearables is implemented in code. Dragbar icon was only added as file, it will be integrated in EXT-7255 (There is no dragbar between 'Edit Outfit' and 'Add to Outfit:' panels).

Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/410/

--HG--
branch : product-engine
2010-05-20 14:31:31 +03:00
Vadim Savchuk fe64168217 Manual merge from default branch.
Auto-resolved conflicts in:
- indra/newview/llpaneleditwearable.cpp
- indra/newview/llviewermenu.cpp
- indra/newview/llviewerwindow.cpp
- indra/newview/skins/default/xui/en/notifications.xml

--HG--
branch : product-engine
2010-05-20 14:05:32 +03:00
Tofu Linden ae0dbecb1c merge from PE's viewer-trunk 2010-05-20 11:44:49 +01:00
Tofu Linden 13d2501c84 SNOW-207/DEV-42245 : FIXED : Texture loading on sculpty plants is failing making content appear to be of poor quality.
Patch by Thickbrick, reviewed by me.
2010-05-20 11:38:57 +01:00
Yuri Chebotarev 56e88c6b2e EXT-7367 FIX - eat sroll wheel above gesture popup list
reviwed by Mike Antipov at https://codereview.productengine.com/secondlife/r/411

--HG--
branch : product-engine
2010-05-20 10:49:15 +03:00
Yuri Chebotarev 1e48e25558 EXT-7051 additional fix - add more hardcoded words to translated dictionary
reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/414/

--HG--
branch : product-engine
2010-05-20 10:45:39 +03:00
Roxie Linden afef949533 automated merge 2010-05-20 00:05:23 -07:00
Roxie Linden d4b37309cb EXT-6734 - Unable to run several copies of viewer
On startup, a piece of code in llappviewer.cpp checks for the existence
and validity of a slurl entered on the command line.  If there is a slurl,
then the slurl is sent to another instance of the viewer if one is running
(for windows and linux only.)
After the SLE refactor of slurls, the startup slurl was set to LAST
by default.  As this is a valid slurl the call to pass the slurl to another
viewer was made, ignoring the codepath that checks for multiple viewer
launches.

The fix defaults the startup slurl to INVALID.  Now, when no slurl is passed
in on the command line, the code that sends the slurl to another instance is
skipped and the 'multiple' flag is checked appropriately.
2010-05-20 00:02:26 -07:00
Roxie Linden da09b1dde1 EXT-7388 - --grid command line argument doesn't do anything.
Grid selection code was looking up the grid by grid host id not grid label.
As SLE grids use their dns name as their lable, it worked there.
However, the beta grids use a short label.
2010-05-19 18:36:51 -07:00
Monroe Linden 42796c938b Updated Windows build of llqtwebkit, adding some support we'll need to fix EXT-5667 (support window.open() in shared media so google docs will work).
revision aacdf69cbf5aa12d77c179296e31ef643ed1ef4a in http://qt.gitorious.org/+lindenqt/qt/lindenqt (currently head of the 'lindenqt' branch)
revision ff8a72a3078b in http://bitbucket.org/lindenlab/llqtwebkit/ (currently head of the default branch)
2010-05-19 17:35:19 -07:00
Monroe Linden f6fc09e4fa Updated Mac build of llqtwebkit, adding some support we'll need to fix EXT-5667 (support window.open() in shared media so google docs will work).
revision aacdf69cbf5aa12d77c179296e31ef643ed1ef4a in http://qt.gitorious.org/+lindenqt/qt/lindenqt (currently head of the 'lindenqt' branch)
revision e2eaaf8b3e96 in http://bitbucket.org/lindenlab/llqtwebkit/ (currently head of the default branch)
2010-05-19 17:26:25 -07:00
Richard Nelson e60fca9ea0 merge 2010-05-19 17:16:52 -07:00
Roxie Linden ab4b60c375 automated merge 2010-05-19 17:12:03 -07:00
Roxie Linden 1cc4fe4413 automated merge 2010-05-19 17:11:33 -07:00
Richard Nelson 47a398e52f EXT-6534 FIXED Snapshot to Disk ... causes snapshot of the active window with a background to the correct size but the window the same size as original 2010-05-19 17:11:28 -07:00
Roxie Linden 5dc6043ae8 automated merge 2010-05-19 17:10:45 -07:00
Roxie Linden e4efbc69ed EXT-7410 Update Vivox SDK to 3.1.0001.8744 2010-05-19 17:09:54 -07:00
Nyx Linden b9096fc954 automated merge with viewer-public 2010-05-19 19:49:50 -04:00
Nyx Linden 8487341b0f AVP-44 WIP Back-end support for multiwearables
Changed a lot of areas of code that were not dealing with multiwearables properly.
Little functionality changed, as the support mechanisms that were out of date were
subtle, but getting closer to no further areas of code that don't properly support
multi-wearables.

Code reviewed by Vir.
2010-05-19 19:48:23 -04:00
Richard Nelson 8c4ec8ac9d merge 2010-05-19 16:26:55 -07:00