Loren Shih
6eb5f380e3
Extracted LLInventoryObserver classes from LLInventoryModel.h into their own subclass, LLInventoryObservers.h. This reduces dependencies and compile times, and makes these classes easier to locate.
...
I have not yet refactored classes to remove #include "llinventorymodel.h" and replace with #include "llinventoryobservers.h". This will happen later.
2009-11-12 13:40:01 -05:00
Eric M. Tulla (BigPapi)
e2a273f28e
update merge with viewer-2-0
2009-11-12 13:27:50 -05:00
Andrew Dyukov
74d5a6605b
Fixed normal bug EXT-2375 (Nearby Chat: Click on object name spawns Person
...
Inspector instead of Object Inspector)
--HG--
branch : product-engine
2009-11-12 20:23:43 +02:00
richard
5c23df8654
merge
2009-11-12 10:19:53 -08:00
Leyla Farazha
a4467f7245
Minimized floaters will now follow top left when main view is resized
2009-11-12 10:19:30 -08:00
richard
1d78ebedbd
don't use LLWidgetTypeRegistry for now (useful only for schema generation)
...
reverted ui_ctrl registration for creation of dummy LLUICtrls
2009-11-12 10:19:23 -08:00
Lynx Linden
c0ff08e0b4
Automated merge with ssh://hg.lindenlab.com/moss/viewer2voiceparity/
2009-11-12 18:03:36 +00:00
Lynx Linden
700085a093
EXT-2367: Fixed potential NULL dereference crash in voice chat.
2009-11-12 18:03:01 +00:00
Tofu Linden
e5a2b1c458
merge.
2009-11-12 17:58:40 +00:00
Eugene Mutavchi
978dd80c96
Implemented major sub-task EXT-2364 (Items in group/ad-hoc IM participant list (avatar names) should be reshaped when adding/removing the "(Moderator)" label)
...
--HG--
branch : product-engine
2009-11-12 19:54:45 +02:00
Eugene Mutavchi
181ac27742
Initial implementation of normal task EXT-2159 (Create Vertical Slider to use for zoom in / out controls in view)
...
--HG--
branch : product-engine
2009-11-12 19:46:27 +02:00
Dmitry Zaporozhan
d149b28173
Merge
...
--HG--
branch : product-engine
2009-11-12 19:29:05 +02:00
Mark Palange (Mani)
a5f6da0975
merge
2009-11-12 09:26:54 -08:00
Rick Pasetto
3dd79ad226
merge
2009-11-12 09:23:57 -08:00
Mark Palange (Mani)
f9f2852ff2
DEV-42715 Fixed lllogin SRV request timeout unit test.
...
Also made SRV config options not persistent.
reviewed by brad
2009-11-12 09:19:32 -08:00
Alexei Arabadji
3b7ed8a4e9
related to EXT-2397 "Notification and IM toasts stop to appear after pressing Reply in any IM toast"
...
corrected on hover lost event handling
--HG--
branch : product-engine
2009-11-12 19:08:31 +02:00
Alexei Arabadji
e7af49ce5d
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
...
--HG--
branch : product-engine
2009-11-12 18:58:29 +02:00
Alexei Arabadji
4c637196e4
fixed EXT-2397 "Notification and IM toasts stop to appear after pressing Reply in any IM toast"
...
--HG--
branch : product-engine
2009-11-12 18:57:27 +02:00
Eric M. Tulla (BigPapi)
4272ecaabe
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-11-12 11:54:14 -05:00
James Cook
7a45dec2d5
merge
2009-11-12 08:53:20 -08:00
Dmitry Oleshko
381c9f468d
fixed major bugs
...
(EXT-2392) No "login" toast appears with overall number of unresolved interactive notifications
(EXT-2391) Notifications overflow toast is broken
--HG--
branch : product-engine
2009-11-12 18:48:02 +02:00
James Cook
d6136a40b1
merge
2009-11-12 08:29:38 -08:00
Brad Payne (Vir Linden)
de6ca4c5ea
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-11-12 11:20:57 -05:00
Andrew Dyukov
e8c3eb438c
Fixed minor bug EXT-1499 (Finalize the Home panel and add tooltips to the tab grabs)- changed one icon
...
I forgot about in yesterday's fix.
--HG--
branch : product-engine
2009-11-12 18:15:17 +02:00
Tofu Linden
74cb5c82a4
fix silly error that was nerfing the outgoing call dialog.
...
more work towards a decent DEV-42312 and DEV-42313
2009-11-12 16:01:29 +00:00
Eugene Kondrashev
eddda09e1d
Fixed Major sub-task EXT-2398-Mini inspector should be opened by DOUBLE-click on the IM message header not by single-click
...
--HG--
branch : product-engine
2009-11-12 17:54:22 +02:00
Lynx Linden
a4375f8a30
DEV-41324 DEV-41331: Improvements to the Avaline voice workflow.
...
Don't show the "Start IM" button in the incoming call request for an
Avaline call. And display the phone number of the incoming call as the
avatar name, instead of "(???) (???)".
2009-11-12 15:46:51 +00:00
Mike Antipov
fcb99c3040
Work on major sub-task EXT-991 (Update bottom bar behavior on resize)
...
Code refuctored:
- moved code to process Borrom Bar shrinking into separate method
- unified code to process a hiding of the Bottom Tray's buttons
Code is ready to process shrink after min width is reached & be synchronized with user hidden buttons
--HG--
branch : product-engine
2009-11-12 17:43:23 +02:00
Eugene Kondrashev
86c63e36b5
Fixed major bug EXT-2400-Viewer crashes on right button click upon IM P2P chiclet. Removed call to non-existing child
...
--HG--
branch : product-engine
2009-11-12 17:36:17 +02:00
Tofu Linden
64c1146213
add Cancel button to outgoing call dialog, make it work (perhaps), make the name of the departing voice session more accurate (perhaps). WIP.
2009-11-12 15:35:08 +00:00
Brad Payne (Vir Linden)
c8c0c51bf6
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-11-12 10:28:41 -05:00
Loren Shih
e2a40ec0ca
merge
2009-11-12 10:06:57 -05:00
angela
b4a3b65a60
fix merge error
2009-11-12 23:02:41 +08:00
Tofu Linden
41f48a16a9
newlineorama.
2009-11-12 15:02:08 +00:00
Igor Borovkov
4d616fdfae
no ticket, removed misleading warning message about supposedly non-existent session
...
--HG--
branch : product-engine
2009-11-12 16:46:44 +02:00
Vadim Savchuk
e4ad08dcfc
Merge from default branch
...
--HG--
branch : product-engine
2009-11-12 16:30:02 +02:00
Tofu Linden
c2b227c939
more inching towards outgoing call popup goodness...
2009-11-12 14:28:57 +00:00
Tofu Linden
7cf3008da7
more work on the outgoing call popup...
2009-11-12 14:15:19 +00:00
Lynx Linden
79e6171b26
EXT-2363: Rename 'Friends Conference' to 'Ad-hoc Conference'
2009-11-12 13:50:03 +00:00
angela
f9646bd759
Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/
2009-11-12 21:36:49 +08:00
angela
ff09b049a7
merge
2009-11-12 21:36:34 +08:00
Tofu Linden
095a3d4372
more mimicking of the good parts of the incoming_floater!
2009-11-12 13:33:54 +00:00
Igor Borovkov
047eb37967
merge
...
--HG--
branch : product-engine
2009-11-12 15:27:22 +02:00
Igor Borovkov
2e01e2bfbd
no ticket, fixed IM message counting and firing new message balloon
...
--HG--
branch : product-engine
2009-11-12 15:24:58 +02:00
angela
11fc2da6fa
make color and font affecting both nearby chat and toasts
2009-11-12 21:20:18 +08:00
angela
b1a81afef6
add optional style params in setText function
2009-11-12 21:17:31 +08:00
Lynx Linden
95adfa4cac
merge
2009-11-12 13:06:37 +00:00
Lynx Linden
40731c7eb8
DEV-2925: Remove a null char at the end of the location string.
2009-11-12 12:57:34 +00:00
Lynx Linden
daefef6e66
DEV-2925: Remove support for secondlife:///app/objectim URLs.
...
These are no longer generated in Viewer 2.0 (instead we use
notifications to send object IMs to the user), so there's no
need to look for them in every textbox. Users can get details
on any objects spamming them via the new remote object inspector.
2009-11-12 12:43:18 +00:00
Lynx Linden
393f68c1a9
DEV-2925: Added a new remote object inspector.
...
This is used to display details about objects that may not be in the
current scene (the existing object inspector is tied to selection and
only works for objects in the scene). The remote inspector lets you see
the name and owner of the object. You can also teleport to the object's
location, view the location on the map, or mute the object.
I've also added more information to the notification you receive when
an object sends you an IM via llInstantMessage(). This notification now
has an "Inspect" button that brings up the remote object inspector.
2009-11-12 12:36:30 +00:00