Nat Goodspeed
57b68d9bfe
Resync indra/test's LD_LIBRARY_PATH with ADD_INTEGRATION_TEST
2009-12-03 12:00:20 -05:00
Alexei Arabadji
ebdb78ef3b
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
...
--HG--
branch : product-engine
2009-12-03 18:59:57 +02:00
Sergey Borushevsky
501bb663ac
Fixed minor bug EXT-2466 (Call menuitem in the Friends context menu is disabled always)
...
--HG--
branch : product-engine
2009-12-03 18:59:31 +02:00
Alexei Arabadji
8d2752c3a6
fixed 'accept' of voice group chat
...
--HG--
branch : product-engine
2009-12-03 18:59:23 +02:00
Nat Goodspeed
1b8b6830b7
Reconcile llsdutil_tut.cpp with Kent's LLSD API change
2009-12-03 11:58:38 -05:00
bea@american.lindenlab.com
9b17e6710b
merge
2009-12-03 08:49:08 -08:00
bea@american.lindenlab.com
db4ea92fa8
merge
2009-12-03 08:48:47 -08:00
bea@american.lindenlab.com
1973cdc4e6
Add Doxygen comments
2009-12-03 08:47:59 -08:00
Loren Shih
bd4ad607ba
EXT-2410 : Accepting an offered notecard should open the inventorySP
...
Preliminary checkin to improve this infrastructure.
--HG--
branch : avatar-pipeline
2009-12-03 11:20:21 -05:00
Loren Shih
2adf9d6b04
EXT-2410 : Accepting an offered notecard should open the inventorySP
...
Preliminary checkin to improve this infrastructure.
--HG--
branch : avatar-pipeline
2009-12-03 11:18:59 -05:00
Dmitry Zaporozhan
7dce1bad0c
Fixed normal bug EXT-3021 - Viewer crashes on receiving notification for creating script(offer) chiclet for same object in second time.
...
--HG--
branch : product-engine
2009-12-03 17:55:17 +02:00
Nyx (Neal Orman)
0cfc3af9ac
fixing bad cast that was causing a compiler error.
...
Code reviewed by Seraph
--HG--
branch : avatar-pipeline
2009-12-03 10:45:55 -05:00
Nat Goodspeed
91dd8b2371
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-12-03 10:38:26 -05:00
Loren Shih
99179a0195
Remove targeted swear word. We don't need Mozilla to know that we think they're ****ers.
...
--HG--
branch : avatar-pipeline
2009-12-03 10:27:05 -05:00
angela
a28de873ce
EXT-2575 [BSI] Deleting content inside a prim from build floater deletes prim, rather than content
2009-12-03 22:28:53 +08:00
Yuri Chebotarev
f2e4e9efa9
fix for low EXT-3090 "Select All" item should be disabled if there is no text in nearby chat's input field
...
--HG--
branch : product-engine
2009-12-03 16:10:21 +02:00
Yuri Chebotarev
3b05656ba1
fix for normal EXT-2913 [BSI] Archived notice of Group1 is shown in any group Group2 until other notice is selected
...
--HG--
branch : product-engine
2009-12-03 14:13:21 +02:00
Yuri Chebotarev
9fa2fae98a
merge
...
--HG--
branch : product-engine
2009-12-03 14:00:53 +02:00
Mike Antipov
22303da8a6
Work on task EXT-3081 (Separate Message Well on Notifications Well and IM Well)
...
Initial commit
-- added two floater classes derived from LLSysWellWindow to work with Notification Well & IM Well
-- register two floaters in place of previous sys_well (but with the same xml file)
-- replace using of LLSysWellWindow with LLNotificationWellWindow in the out code (except of in LLScreenChannel::updateShowToastsState)
-- rename member variable in bottom tray used for Notification Well
--HG--
branch : product-engine
2009-12-03 13:48:07 +02:00
Vadim Savchuk
5fac7f1d35
Merge from default branch.
...
--HG--
branch : product-engine
2009-12-04 16:14:49 +02:00
Dmitry Oleshko
63cebc3ae0
partial implementation for the following tasks
...
(EXT-2803) Create notifications and dialogs to negotiate P2P voice chat (shown over the Speak button)
(EXT-2806) Create notification windows and dialogs to negotiate Group Voice Chat (docked to Speak button's chevron)
(EXT-2802) Create notifications and dialogs to negotiate AvaLine calls (shown over Speak button)
(EXT-2805) Create notifications and dialogs to negotiate Ad-Hoc calls (shown over Speak button)
implemented: invitations, displaying of notifications according to the state of current voice chat session
--HG--
branch : product-engine
2009-12-04 15:05:42 +02:00
Andrew Dyukov
fc0679cd83
Implemented normal task EXT-3082 (Remove Reply button from IM toasts
...
and open IM window just by click on IM toast).
--HG--
branch : product-engine
2009-12-04 14:51:58 +02:00
Paul Guslisty
61d4514612
fixed low bug EXT-2963 (Buttons in Move floater don't have tool-tips)
...
--HG--
branch : product-engine
2009-12-04 14:47:58 +02:00
Denis Serdjuk
83c8f43f8d
implemented Task EXT-2304 Offer Notifications should include a link that highlights the landmark or item in the appropriate side panel
...
Changes:
This task had been already implemented. llurlentyinventory and llurlregistry have been changed to correct parsing of offer url
--HG--
branch : product-engine
2009-12-04 14:15:08 +02:00
Andrew Dyukov
96a11910b1
Fixed normal bug EXT-1710 (IM & Chat: System messages should have
...
SL icon and title). "i" icon is temporarily used, changing it in
xml to SL icon moved to new bug- EXT-3132.
--HG--
branch : product-engine
2009-12-04 13:46:58 +02:00
Yuri Chebotarev
6061c0fb5d
fix for EXT-1190 Accordion should support keyboard accessability
...
--HG--
branch : product-engine
2009-12-03 13:47:52 +02:00
Yuri Chebotarev
37e547b67d
no ticket. system messages where without time after changeset 5886:8987aefb8b91
...
--HG--
branch : product-engine
2009-12-03 13:46:04 +02:00
Yuri Chebotarev
032675b5dd
a bit more for (EXT-3077) [BSI] Object chat of objects without a name bork nearby chat toasts and log
...
revert name changes since this may break some functionality...
--HG--
branch : product-engine
2009-12-03 13:28:55 +02:00
angela
e8196ca93f
EXT-2313 Add auto-close behavior to mini-inspector floater
2009-12-03 18:38:15 +08:00
Paul Guslisty
0c6c590a67
fixed low bug EXT-3040 (Tool-tip for '+' icon on Picks tab says nothing about classifieds)
...
--HG--
branch : product-engine
2009-12-03 12:07:31 +02:00
Paul Guslisty
eeb1970f79
fixed normal bug EXT-3038 (Verb buttons in avatar profile panel don't have tool-tips)
...
--HG--
branch : product-engine
2009-12-03 11:57:58 +02:00
Yuri Chebotarev
62feea50c2
fix for normal EXT-3077 [BSI] Object chat of objects without a name bork nearby chat toasts and log
...
for information - since I think that messages from nowhere is bad practice for user - if object that send message has no name I use object id as name
--HG--
branch : product-engine
2009-12-03 10:31:00 +02:00
Yuri Chebotarev
003b6f1950
fix for normal EXT-2944 [BSI] Object chat and Resident chat is combined in Nearby Chat floater when object and Resident share the same name
...
--HG--
branch : product-engine
2009-12-03 09:23:53 +02:00
Rick Pasetto
3c69340570
DEV-42827 Implement volume slider on media controls
...
Introducing a volume slider that pops up when you hover
over the "mute" button. Fades out with the rest of the
controls. Had to also render (by hand) the background
image. Cleaned up the XUI file.
2009-12-02 21:30:41 -08:00
brad kittenbrink
256b8aba31
Fixed some more header file usage after the recent rebasing of my old precompiled header work.
2009-12-02 20:20:12 -08:00
Erica
f082aa60f2
Automated merge with ssh://hg.lindenlab.com/james/gooey
2009-12-02 19:34:18 -08:00
Erica
bce5052fb5
About Land layout cleanup
2009-12-02 19:34:03 -08:00
skolb
469f17f9c2
local merge
2009-12-02 18:20:27 -08:00
skolb
178c04f160
removed the unused AutoPlayMedia flag. This is now governed by the ParcelMediaAutoPlayEnable flag.
2009-12-02 18:19:14 -08:00
skolb
533988ee86
unify the two media auto play preferences into one. The ParcelMediaAutoPlayEnable flag now controls both (horribly named, but must be preserved for legacy purposes).
2009-12-02 18:12:30 -08:00
angela
c5a8a7c8ce
merge from remote repo
2009-12-03 10:10:11 +08:00
angela
1a75c4c490
delete unused code EXT-2927 [BSI] profile text and partner text overwrite after selecting I button on a user
2009-12-03 09:53:24 +08:00
James Cook
db37d721bd
Use new Erica-supplied login screen bottom image.
2009-12-02 17:51:41 -08:00
Monroe Linden
44d5fcb776
Changed the behavior of LLViewerMediaImpl::setDisabled() to interact more predictably with auto-play.
...
Disabling and re-enabling media should work much more like teleporting away and teleporting back -- media will respect the auto-play flag when reloading, instead of returning to its previous load state.
2009-12-02 17:34:27 -08:00
James Cook
0a490ca377
Automated merge with ssh://hg.lindenlab.com/james/gooey
2009-12-02 17:17:54 -08:00
angela
de9273d80b
EXT-2854 Replace instances in the viewer with the final search maturity names
2009-12-03 09:16:29 +08:00
James Cook
9897e53de5
merge
2009-12-02 17:16:27 -08:00
James Cook
11ffb356cf
Fix the build - merge missed an include file
2009-12-02 17:12:23 -08:00
skolb
4e0706f641
Cleaned up the conditional code a bit in llviewerkeyboard.cpp, start_gesture
2009-12-02 17:10:21 -08:00
Mark Palange (Mani)
7bb1050564
Merge
2009-12-02 17:08:23 -08:00