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
Mike Antipov
01d90c3d3e
Work on major sub-task EXT-991 (Update bottom bar behavior on resize)
...
increased chat bar text field to compensate changes in changeset: 4652 : d0832cfa71c6
(for EXT-2356 Replace Log button in bottom tray with up arrow)
--HG--
branch : product-engine
2009-11-12 14:25:34 +02:00
Tofu Linden
438db7bbac
reacreate floater_outgoing_call in the new style of floater_incoming_call.
2009-11-12 12:04:02 +00:00
Tofu Linden
3888fed3f6
merge.
2009-11-12 11:57:28 +00:00
Eugene Kondrashev
a69ab24094
Fixed Low bug EXT-2345-There is wrong direction arrow in IM window, after this window has been closed and restored (refer to screenshot)
...
--HG--
branch : product-engine
2009-11-12 13:29:27 +02:00
Dmitry Oleshko
36e0f729d3
final fix for
...
(EXT-989) IM chiclets should expand to show active voice indicator
(EXT-988) Change indication of unread messges in chiclets
fixed chiclets' behavior in the Message Well Window
--HG--
branch : product-engine
2009-11-12 12:59:04 +02:00
Dmitry Zaporozhan
38115eb90b
Fixed path to image Generic_Object_Small
...
--HG--
branch : product-engine
2009-11-12 12:15:32 +02:00
Lynx Linden
b38388d131
Automated merge with ssh://hg.lindenlab.com/moss/viewer2voiceparity/
2009-11-12 09:54:07 +00:00
Lynx Linden
96286cde37
DEV-41324: Updated the Incoming Call floater.
...
This is now a dockable floater with a dock tongue. It currently floats
over the sys well, where other system messages appear. The appearance
now matches the voice spec more closely. It also tells you which voice
channel you would be leaving if you accept the call.
2009-11-12 09:53:34 +00:00
Steve Bennetts
6524295bf0
merge
2009-11-12 00:10:29 -08:00
Steve Bennetts
a7fa9c4936
Better fix for edge case where abort call to readComplete() can cause a crash.
2009-11-12 00:07:07 -08:00
callum
f936f661bc
Fix for DEV-42720 - media settings floater is Empty
2009-11-11 17:54:41 -08:00
James Cook
14fb8d400e
EXT-2368 Group inspector now shows no Join/Leave buttons until data is fetched
2009-11-11 17:44:15 -08:00
Loren Shih
9b1680927f
merge
2009-11-11 20:41:24 -05:00
Eric M. Tulla (BigPapi)
7e74e18548
Fix for EXT-2244 - Auto fill the My Outfits folder from library/clothing if empty
...
-Reviewed by Seraph
2009-11-11 20:27:29 -05:00
Loren Shih
bcdd3c25b6
Took out unnecessary llinfos msg from LLInventoryModel.
2009-11-11 20:21:45 -05:00
Loren Shih
067f91f8ad
EXT-387 : Clean up WARNINGS - Advanced.DumpAvatarLocalTextures
...
Added menu callbacks in for avatar texture debug, but disabled functionality for release version.
2009-11-11 19:55:37 -05:00
richard
e3690313a2
EXT-2049 - tighten up indentations on inventory
2009-11-11 16:47:23 -08:00
James Cook
7eb8bb4ad1
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-11-11 16:36:02 -08:00
James Cook
391f423cd0
Revert global font setting for UI controls because it makes About Land crash
...
Apparently moving ui_ctrl to a different registry breaks our ability to
create dummy ones in code. Reverting until I have time to investigate.
Discussed with Richard
2009-11-11 16:34:23 -08:00
Rick Pasetto
6a3e8353a7
Fix merge error (and hence build breakage :( )
2009-11-11 16:32:54 -08:00
Rick Pasetto
4a376104f1
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
2009-11-11 16:14:19 -08:00
Loren Shih
6bdd6eeb98
EXT-2261 : Inventory view should show default foldres (i.e. expand My Inventory)
2009-11-11 19:13:33 -05:00
Rick Pasetto
bea3b937d9
Fix a potential crash if scroll button is not there
2009-11-11 16:12:25 -08:00
Rick Pasetto
e3356c0695
some minor changes based on Richard's code review
...
Code Collab #34
2009-11-11 16:07:02 -08:00
Brad Payne (Vir Linden)
9245322706
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-11-11 18:57:12 -05:00
Monroe Linden
eda34b82ee
Remove references to media_panel_scroll in LLPanelPrimMediaControls::updateShape(), as it was removed from the XUI file.
2009-11-11 15:50:43 -08:00
brad kittenbrink
8519205533
Changing VC Debugger working directory to be ${CMAKE_CURRENT_SOURCE_DIR} to restore ability to edit in place xui files, shaders, etc.
2009-11-11 18:49:32 -05:00
Leyla Farazha
46e9192016
merge
2009-11-11 15:24:54 -08:00
Brad Payne (Vir Linden)
4f3d32f5c7
Believe this fixes the remaining issues with missing attachment links on first use of 2.0 - EXT-1593 and EXT-1591.
2009-11-11 18:23:54 -05:00
Leyla Farazha
3732d41a10
EXT-950 Minimized floaters default to a bad location onscreen
...
EXT-2298 [BSI] Busy mode response shows as "|TOKEN COPY BusyModeResponse|" in General prefs while offline
2009-11-11 15:23:08 -08:00
Loren Shih
2117b096d7
EXT-2377 : Add XML switch to showing either menubar or gear menu
...
Reverting previous checkin for enabling this. This is more complicated than worth spending time on, at the moment.
2009-11-11 18:13:43 -05:00
James Cook
816133718e
Fix bad XML causing UI images not to load.
2009-11-11 15:09:28 -08:00
James Cook
afb49ed36e
Fix bad XML causing UI images not to load.
2009-11-11 15:09:28 -08:00
Rick Pasetto
9fe4b5a3c1
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
2009-11-11 15:08:22 -08:00
Rick Pasetto
d023672e59
Add ToolTip functionality to LLScrollListCell
...
This change enables a user to set a custom tool tip on a particular
scroll list cell by calling setToolTip(). Then, this tool tip is
used. If this is not done, the existing tooltip functionality is left
alone.
Reviewed by Richard
2009-11-11 15:08:00 -08:00
Steve Bennetts
064c91ae52
Merge from product-engine
2009-11-11 14:56:51 -08:00
Xiaohong Bao
65b1f7f65c
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2009-11-11 14:55:38 -08:00