Commit Graph

4647 Commits (f87dcc28fa1dcd6ca78e5f1a95273fa6b1c1205b)

Author SHA1 Message Date
Loren Shih f87dcc28fa EXT-2760 : Double-clicking an Object in inventory opens the permissions in the side tray
Double clicking on an object no longer brings up both the floater and sidetray (it only brings up the sidetray now).

--HG--
branch : avatar-pipeline
2009-12-16 13:53:19 -05:00
Loren Shih 073ec70829 automated merge viewer2.0->avp
--HG--
branch : avatar-pipeline
2009-12-15 19:20:03 -05:00
Loren Shih 4d4406820b automated merge avp->avp
--HG--
branch : avatar-pipeline
2009-12-15 19:17:30 -05:00
Loren Shih a162d6afda EXT-3304 : Can't reorder items in the Favorites accordions
Fixed a bug where addChangedMask(LLInventoryObserver::SORT) was being called before the new sort order was established.

--HG--
branch : avatar-pipeline
2009-12-15 19:16:42 -05:00
Lynx Linden e7eae45390 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0 2009-12-15 23:53:41 +00:00
Lynx Linden a575816d17 merge 2009-12-15 23:53:03 +00:00
Lynx Linden 931591c0ab EXT-3496: Add a common authentication key for search and home.
Search and the Home sidetray now have their own specific
authentication keys that they support from login.cgi, but they
fallback to a common key as follows:

Search: "search_token", fallback to "auth_token"
Home: "home_sidetray_token", fallback to "auth_token"
2009-12-15 23:45:38 +00:00
skolb eb6b69640e Merge 2009-12-15 15:20:26 -08:00
skolb 90d7c2ec13 Merge 2009-12-15 15:19:57 -08:00
Lynx Linden dec9e56afe EXT-3180: Update Home sidetray to temporary URL. 2009-12-15 23:18:42 +00:00
Runitai 1f8ad2651d Merge 2009-12-15 16:53:29 -06:00
Runitai a81a2f19b2 EXT-3488 Fix for sky not being reflected in water any more. 2009-12-15 16:47:48 -06:00
Steve Bennetts 88a146e0bb Merge 2009-12-15 14:46:00 -08:00
Steve Bennetts 710d2a6db3 Fixed an edge case that was triggering an error check when doing HTTP texture fetches. 2009-12-15 14:44:41 -08:00
Brad Payne (Vir Linden) 2dd09062d1 menu separator fix
--HG--
branch : avatar-pipeline
2009-12-15 17:33:59 -05:00
Rick Pasetto e62ee60e11 merge 2009-12-15 14:32:32 -08:00
Brad Payne (Vir Linden) e92a88159c For EXT-3448: New attachments detach after relog. Added a check that the only objects deleted by LLAppearanceManager are links. Probably not the cause of disappearing objects in this bug, but a good safety feature.
--HG--
branch : avatar-pipeline
2009-12-15 17:29:05 -05:00
Rick Pasetto 9cf8c3e654 Automated merge with ssh://rick@hg.lindenlab.com/skolb/media/ 2009-12-15 14:05:16 -08:00
skolb dc9a62b5ab Merge 2009-12-15 13:31:18 -08:00
skolb 589472a4e9 Merge 2009-12-15 13:30:39 -08:00
Eric M. Tulla (BigPapi) 89a8182c2c Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-12-15 16:21:10 -05:00
Eric M. Tulla (BigPapi) eafd52200d fix for post merge compile error (minor) 2009-12-15 16:20:17 -05:00
Brad Payne (Vir Linden) 109de76574 merge
--HG--
branch : avatar-pipeline
2009-12-15 16:12:24 -05:00
Ramzi Linden 0f5a757540 L10N: some legacy strings were left in panel_preferences_setup.xml. At least I will make them consistent. 2009-12-15 13:12:16 -08:00
Brad Payne (Vir Linden) 0905d85761 For EXT-3448: New attachments detach after relog. This fixes the most common problem, failing to create COF link to new attachment.
--HG--
branch : avatar-pipeline
2009-12-15 16:10:29 -05:00
Eric M. Tulla (BigPapi) 08495d3f63 Merging in latest PE changes from https://hg.aws.productengine.com/secondlife/viewer-2-0/ 2009-12-15 15:41:51 -05:00
Monroe Linden 1f7bf92168 New mac build of llqtwebkit.
This build is based on the following:

http://bitbucket.org/girish/llqtwebkit-4.6/
	revision 08c337619f50
	local change: comment out the definition of qt_sendSpontaneousEvent() in llembeddedbrowserwindow.cpp

git://gitorious.org/~girish/qt/girishs-qt.git
	branch lindenqt
	revision b4820037eac5c52d44df99ec37a50edd1796c897
2009-12-15 12:41:20 -08:00
Loren Shih fbf5d1a992 EXT-3304 : Can't reorder items in the Favorites accordions
EXT-3476 : Dragging and item in the PlacesSP brings up the InventorySP
EXT-1916 : Landmarks are not sorted in the Favorites Accordion

Added a new LLInventoryObserver::SORT request for resorting folder contents.
Landmarks no longer use the same sorting as accordions.

--HG--
branch : avatar-pipeline
2009-12-15 13:47:31 -05:00
Mike Antipov 06f8017674 added more comments to code
--HG--
branch : product-engine
2009-12-15 19:32:22 +02:00
skolb 7c18f1c303 Merge 2009-12-15 09:25:08 -08:00
Loren Shih d19a9f7cb2 EXT-3199 : Re-enable task inspection inventory sidepanel
Re-enabled right click menu option for bringing up this sidepanel.

--HG--
branch : avatar-pipeline
2009-12-15 12:10:36 -05:00
Mike Antipov 5eb82cdeaa Work on task EXT-3147 (Implement new states for message indicators)
-- Implemented requirement: Opening either Message Well will clear the "new messages" state (and thus the "lit" status),
 even though there may still be unread messages

--HG--
branch : product-engine
2009-12-15 18:56:38 +02:00
Loren Shih 871e64726a automated merge avp->avp
--HG--
branch : avatar-pipeline
2009-12-15 11:52:44 -05:00
Loren Shih 045e3e0657 EXT-3199 : Re-enable task inspection inventory sidepanel
Re-added the task sidepanel.
Fixed bottom button layout.
Edit mode now always returns true for inventory sidepanels.

--HG--
branch : avatar-pipeline
2009-12-15 11:48:55 -05: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
Mike Antipov eccc3ed597 Work on task EXT-3147 (Implement new states for message indicators)
-- fixed bug: Well icon leaves in "Unlit" state if new message arrives when it is in the "Lit" state while flashing
Improved behavior of reversing Lit/Unlit states

--HG--
branch : product-engine
2009-12-15 16:41:52 +02:00
Mike Antipov 40a10565ac Work on task EXT-3147 (Implement new states for message indicators)
-- Code recactored for future implementation of "Opening either Message Well will clear the "new messages" state (and thus the "lit" status)"

--HG--
branch : product-engine
2009-12-15 15:40:13 +02:00
Alexei Arabadji c77266e216 Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG--
branch : product-engine
2009-12-15 19:11:08 +02:00
Alexei Arabadji 7ba2f99ae0 mplemented EXT-3395 “Docked IM/Chat windows shouldn't hide when voice control panel is opened”;
--HG--
branch : product-engine
2009-12-15 19:10:27 +02:00
Sergei Litovchuk 0847789222 Fixed normal bug EXT-3409 "Places panel: pick for remote location created with current agent's coordinates".
- Fixed storing global position for remote location pick.
- Fixed setting current location to the pick.
- Fixed pick location text. Added resolving remote parcel name from ID.
- Cleaned up unused code in llpanelpick.

--HG--
branch : product-engine
2009-12-15 18:36:53 +02:00
Vadim Savchuk e303864c17 Merge from default branch.
Resolved conflicts in llalertdialog.h and llnotify.cpp (local deletion vs
remote change) by removing them.

--HG--
branch : product-engine
2009-12-15 17:14:31 +02:00
Dmitry Zaporozhan 40fa036891 Fix for normal bug EXT-3465 - Any changes made in Preferences floater are canceled after viewer shutdown.
--HG--
branch : product-engine
2009-12-15 16:18:26 +02:00
Yuri Chebotarev fe56e4fbfb fix for bug EXT-3254 IM well expands unexpectedly after attempt to resize
problem was with floater minHeight. set minheight to 1 list item height (so 1 item is always visible)

--HG--
branch : product-engine
2009-12-15 14:28:51 +02:00
Yuri Chebotarev 50792b7c2a fix for normal EXT-3252 IM well closes if the lower IM session has been closed
--HG--
branch : product-engine
2009-12-15 13:22:09 +02:00
Lynx Linden d82f82d796 EXT-3394: Reverting removal of prefs volume slider.
This change reverts the code parts of e038c0211968 that relate to the
sound preferences slider. Lis has already re-enabled the slider in the
panel_preferences_sound.xml XUI file.

So the overall change for EXT-3394 is now:
- remove the volume slider from the Voice Controls panel
- make 50 be the default volume level, not 62
2009-12-15 11:11:28 +00:00
Dmitry Zaporozhan c157c1176a Update for normal task EXT-3089 - Notification toasts positioning, layering and stacking.
Docked LLDialogs are part of toasts positioning rules.

--HG--
branch : product-engine
2009-12-15 10:54:37 +02:00
Alexei Arabadji 02e5d2fd83 Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG--
branch : product-engine
2009-12-15 09:55:36 +02:00
Alexei Arabadji f8f1252d32 mplemented EXT-3396 “All bottom bar buttons, including chiclets and nearby chat, should work as toggles”,
made hide/unhide dockable floaters when undocked;

--HG--
branch : product-engine
2009-12-15 09:55:00 +02:00
Paul Guslisty 9294902626 Fixed normal bug EXT - 3288 (Tool-tips are missing on whole Places panel)
--HG--
branch : product-engine
2009-12-15 08:35:26 +02:00
Rick Pasetto 60e6fa139e Automated merge with ssh://rick@hg.lindenlab.com/skolb/media 2009-12-14 17:58:19 -08:00