James Cook
73abaaddd6
merge
2009-12-07 10:43:53 -08:00
James Cook
864dd45b2b
merge
2009-12-07 10:40:12 -08:00
Sergei Litovchuk
86c686e962
Fix for major bug EXT-3135 "Crash after dragging LM from 'Inventory' accordion to fav bar".
...
- Added method to get currently active tab in sidetray.
- Disabled opening sidetray inventory panel upon receiving new inventory item or after drag-n-drop operations with landmarks in sidetray places panel.
--HG--
branch : product-engine
2009-12-07 20:31:45 +02:00
Lynx Linden
37c7e4059c
DEV-43439: Allow Home side panel URL to be customized.
...
The URL for the Home side panel is now specified via a new
"HomeSidePanelURL" string in app_settings/settings.xml. This
string supports the following substitutions:
CHANNEL = the channel name for the viewer
VERSION = the full version string for the viewer
LANGUAGE = the current language set in the viewer
AUTH_KEY = the authentication key (see below)
The authentication key is an optional string that is read from the
dictionary of strings returned by login.cgi. If login.cgi returns a
key called "home_sidetray_token", then the value of that key is used
for the AUTH_KEY substitution. This lets the server provide a piece of
blind data that can be passed to the Home panel web page to support
authentication. The viewer does not interpret the token in any way.
This change adds a new module, llviewerhome.{cpp|h} to contain the
model functionality, used by the view module, llpanelhome.{cpp|h}.
2009-12-07 18:22:52 +00:00
Loren Shih
83fbe4a631
automated merge viewer2.0->avp
...
--HG--
branch : avatar-pipeline
2009-12-07 13:08:14 -05:00
Loren Shih
ff7f3c348d
EXT-3124 : Add lookup for finding all linked items to an item
...
Commented this feature out since the viewer can't ask the server to change assetIDs of its inventory items.
--HG--
branch : avatar-pipeline
2009-12-07 13:06:24 -05:00
Justin C. Rounds (Chuck)
329d555302
Set font size to SansSerifSmall.
...
http://jira.secondlife.com/browse/EXT-2773
2009-12-07 12:51:37 -05:00
Denis Serdjuk
da8de2b674
implemented Task EXT-2304 Offer Notifications should include a link that highlights the landmark or item in the appropriate side panel
...
Changes:
1.highlighting of landmarks was broken by LLInventoryPanel::getActiveInventoryPanel().
2. escaping of urls
--HG--
branch : product-engine
2009-12-07 19:42:11 +02:00
skolb
3ddd6ad286
Merge viewer 2.0 into media
2009-12-07 09:37:54 -08:00
Dmitry Zaporozhan
3dee439c1d
Implemented normal task EXT-3089 - Notification toasts positioning, layering and stacking.
...
--HG--
branch : product-engine
2009-12-07 19:23:34 +02:00
Paul Guslisty
20d5fafc1c
Fixed low bug EXT - 3038 (Verb buttons in avatar profile panel don't have tool-tips)
...
--HG--
branch : product-engine
2009-12-08 12:01:32 +02:00
Mike Antipov
d4cfcfc7ce
Work on EXT-3147 (Implement new states for message indicators)
...
-- added possibility to show "99+" when unread messages count exceeds 99
--HG--
branch : product-engine
2009-12-08 11:14:00 +02:00
Mike Antipov
d6e22a7579
Fixed major bug EXT-3191 (Crash after dragging inventory item to avatar or IM floater)
...
Reason: Null pointer to cargo data was passed from LLToolDragAndDrop::dragOrDrop in this case.
Fix: added check against NULL of the LLToolDragAndDrop::locateInventory() result in the LLToolDragAndDrop::dragOrDrop().
The same checking presents in another place of the LLToolDragAndDrop::dragOrDrop().
Handling is interrupted in this case.
Thanks Andrew ProductEngine for provided call stack
--HG--
branch : product-engine
2009-12-08 10:03:34 +02:00
Igor Borovkov
0a88e412cc
tast EXT-3096 (Notification toasts mouse hovering behavior), fade behavior is now being reset for all toasts on hovering
...
--HG--
branch : product-engine
2009-12-07 19:09:25 +02:00
Loren Shih
13f1ed2740
EXT-3124 : Add lookup for finding all linked items to an item
...
EXT-3195 : Regenerat Links sometimes pairs to library items
Excluding library when repairing broken links.
Reselecting original selected broken link after repairing.
--HG--
branch : avatar-pipeline
2009-12-07 11:43:24 -05:00
Mike Antipov
4a1bb89faf
Completed normal task EXT-3148 (Implement updating of the IM Well message counter).
...
-- added broken constants' initialization (in Changeset: f0931dcb0481)
--HG--
branch : product-engine
2009-12-07 18:11:33 +02:00
Paul Guslisty
8cd690bc1f
Fixed normal bug EXT - 3074 (Resident name tabs in IM window should not be capitalized)
...
--HG--
branch : product-engine
2009-12-07 18:03:43 +02:00
Yuri Chebotarev
d252d1d57d
merge
...
--HG--
branch : product-engine
2009-12-07 17:02:54 +02:00
Yuri Chebotarev
48803059de
EXT-2989 Chiclet overlaps the voice indicator of another chiclet
...
see comments for details
--HG--
branch : product-engine
2009-12-07 17:01:07 +02:00
Vadim Savchuk
986307972c
merge
...
--HG--
branch : product-engine
2009-12-07 16:49:54 +02:00
Sergei Litovchuk
62dce8b425
Fix for critical bug EXT-3166 "MyInventory/Library Places accordions are causing massive inventory background fetch on startup"
...
- MyInventory/Library Places accordions aren't expanded on startup now.
--HG--
branch : product-engine
2009-12-07 16:45:14 +02:00
Vadim Savchuk
a2434a3a41
Merge from default branch.
...
--HG--
branch : product-engine
2009-12-07 16:31:14 +02:00
Vadim Savchuk
01447fb0d1
merge
...
--HG--
branch : product-engine
2009-12-07 16:30:03 +02:00
Lynx Linden
1db39c97a5
EXT-3189: Fix tab order and location of Grid pulldown.
...
The (optional) Grid pulldown on the login screen is now located below
the Starting Location pulldown, rather than below the Last Name text
entry field. The tab order is also now more obvious.
2009-12-07 14:25:21 +00:00
Vadim Savchuk
7c839098a7
Minor comments cleanup.
...
--HG--
branch : product-engine
2009-12-07 16:18:24 +02:00
Vadim Savchuk
4dc667b83f
merge
...
--HG--
branch : product-engine
2009-12-07 16:17:42 +02:00
Vadim Savchuk
dc6ce7f782
Manual merge from default branch.
...
--HG--
branch : product-engine
2009-12-07 16:04:24 +02:00
Mike Antipov
d5bc38ae2d
Work on normal task EXT-3148 (Implement updating of the IM Well message counter). Fixed Linux build
...
-- move constats into class
--HG--
branch : product-engine
2009-12-07 15:59:49 +02:00
Andrew Dyukov
13dd7431a3
Implemented normal task EXT-3084 (Update Notifications window behavior).
...
- Added hiding window when focus is lost.
--HG--
branch : product-engine
2009-12-07 15:44:44 +02:00
Lynx Linden
fefb08eef5
DEV-43799: Make the search web view be 650x600.
2009-12-07 13:21:42 +00:00
Alexei Arabadji
6eee48e16e
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
...
--HG--
branch : product-engine
2009-12-07 15:15:57 +02:00
Alexei Arabadji
0a617f15a8
implemented EXT-2797 “Making friendship offer should be recorded into IM history”
...
--HG--
branch : product-engine
2009-12-07 15:15:41 +02:00
Mike Antipov
0445b02f35
Work on normal task EXT-3148 (Implement updating of the IM Well message counter). Completed
...
-- added updating count of unread messages in IM Well counter while closing any session.
--HG--
branch : product-engine
2009-12-07 14:39:34 +02:00
Mike Antipov
fdb25e5add
Aditional changes for normal task EXT-3081 (Separate Message Well on Notifications Well and IM Well)
...
-- set different titles for IM & Notification Well windows
-- set different anchors for IM & Notification Well windows
--HG--
branch : product-engine
2009-12-07 14:20:33 +02:00
Mike Antipov
4880959567
Aditional changes for normal task EXT-3081 (Separate Message Well on Notifications Well and IM Well)
...
-- moved Notification well specific functionality from the "LLSysWellChiclet" into derived "LLNotificationChiclet" class
--HG--
branch : product-engine
2009-12-07 13:52:35 +02:00
Mike Antipov
660d818348
Work on normal task EXT-3148 (Implement updating of the IM Well message counter)
...
-- added new member in session stored count of unread messages from real participant and its updating
-- added new method to IM Manager to caclculate total count of unread messages from real participants in all stored sessions
-- added updating count of unread messages in IM Well counter
--HG--
branch : product-engine
2009-12-07 13:40:57 +02:00
Yuri Chebotarev
c6177836ec
no ticket, minor refactoring.
...
add return value to notifyXXX functions, may be usefull
--HG--
branch : product-engine
2009-12-07 12:04:27 +02:00
James Cook
7ff7709f9f
Expose window minimize and restore in LLWindow interface.
...
Add secondlife:///app/login/reg handler for Reg-In-Client
Reviewed with Ambroff
2009-12-04 17:33:36 -08:00
Loren Shih
23068a2e7d
automated merge avp->avp
...
--HG--
branch : avatar-pipeline
2009-12-04 20:09:20 -05:00
Loren Shih
add459cfd2
EXT-3179 : Add ability to recover broken links
...
EXT-3168 : Add "Find Original" to InventoryPanel gear menu
Broken link recovery is still work in progress.
--HG--
branch : avatar-pipeline
2009-12-04 20:07:09 -05:00
James Cook
738dabede2
merge
2009-12-04 16:05:29 -08:00
James Cook
7a83e8913d
EXT-3176 Resizing the nav bar resizes the world view
...
Trivial XML change.
2009-12-04 16:05:04 -08:00
Brad Payne (Vir Linden)
16efeb8581
merge
...
--HG--
branch : avatar-pipeline
2009-12-04 19:01:31 -05:00
Brad Payne (Vir Linden)
f017058345
For EXT-2845, EXT-2846: standardizing gesture context options to work like wearables and attachments
...
--HG--
branch : avatar-pipeline
2009-12-04 18:58:57 -05:00
Brad Payne (Vir Linden)
009c62f13e
Remove gesture links from COF when gesture is deactivated
...
--HG--
branch : avatar-pipeline
2009-12-04 18:57:08 -05:00
Brad Payne (Vir Linden)
5c01958391
For EXT-2879: uncommented web-based inventory fetch. AIS fix is in process.
...
--HG--
branch : avatar-pipeline
2009-12-04 18:55:23 -05:00
Ramzi Linden
7efab06d57
L10N: use consistent language in the Admin menu 'Force owner' options
2009-12-04 15:11:15 -08:00
bea@american.lindenlab.com
13eeba25d8
Fix some missing Doxygen comments
2009-12-04 14:37:50 -08:00
Nat Goodspeed
fde12f0204
DEV-43463: use fixed Boost package on Windows
2009-12-04 17:32:09 -05:00
Ramzi Linden
6f8f68cd39
merge
2009-12-04 14:07:25 -08:00