7af2e93265
EXT-2190 share button in IM should open sidepanel inventory
...
share button in im popup now opens sidepanel inventory.
Code reviewed by Seraph
2009-11-12 17:58:31 -05:00
a92c6ef67f
merging put on submenu fix with avatar-pipeline
2009-11-12 17:12:21 -05:00
8863987cae
EXT-2354 menus contain multiple lines not editable in XUI
...
We're building a pie menu in code, complete with separators for this particular
branch of submenus. This is terrible and ugly and needs to be killed, but
for now I removed the lines that cause the separators to be added where there
are empty pie slices.
Code reviewed by Vir
2009-11-12 17:11:47 -05:00
4acc05b379
merge latest batch of stuff from viewer2voiceparity
2009-11-12 19:36:24 +00:00
dd9abe71c2
merge
2009-11-12 14:05:55 -05:00
d53a354a9c
Rename LLInventoryObservers to LLInventoryObserver
2009-11-12 13:56:36 -05:00
0bcc6626e1
merge
2009-11-12 13:47:10 -05:00
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
e5a2b1c458
merge.
2009-11-12 17:58:40 +00:00
a5f6da0975
merge
2009-11-12 09:26:54 -08:00
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
7a45dec2d5
merge
2009-11-12 08:53:20 -08:00
d6136a40b1
merge
2009-11-12 08:29:38 -08:00
de6ca4c5ea
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-11-12 11:20:57 -05:00
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
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
c8c0c51bf6
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-11-12 10:28:41 -05:00
e2a40ec0ca
merge
2009-11-12 10:06:57 -05:00
c2b227c939
more inching towards outgoing call popup goodness...
2009-11-12 14:28:57 +00:00
7cf3008da7
more work on the outgoing call popup...
2009-11-12 14:15:19 +00:00
095a3d4372
more mimicking of the good parts of the incoming_floater!
2009-11-12 13:33:54 +00:00
95adfa4cac
merge
2009-11-12 13:06:37 +00:00
40731c7eb8
DEV-2925: Remove a null char at the end of the location string.
2009-11-12 12:57:34 +00:00
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
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
438db7bbac
reacreate floater_outgoing_call in the new style of floater_incoming_call.
2009-11-12 12:04:02 +00:00
3888fed3f6
merge.
2009-11-12 11:57:28 +00:00
b38388d131
Automated merge with ssh://hg.lindenlab.com/moss/viewer2voiceparity/
2009-11-12 09:54:07 +00:00
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
6524295bf0
merge
2009-11-12 00:10:29 -08:00
a7fa9c4936
Better fix for edge case where abort call to readComplete() can cause a crash.
2009-11-12 00:07:07 -08:00
f936f661bc
Fix for DEV-42720 - media settings floater is Empty
2009-11-11 17:54:41 -08:00
9b1680927f
merge
2009-11-11 20:41:24 -05:00
bcdd3c25b6
Took out unnecessary llinfos msg from LLInventoryModel.
2009-11-11 20:21:45 -05:00
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
7eb8bb4ad1
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-11-11 16:36:02 -08:00
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
6a3e8353a7
Fix merge error (and hence build breakage :( )
2009-11-11 16:32:54 -08:00
4a376104f1
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
2009-11-11 16:14:19 -08:00
6bdd6eeb98
EXT-2261 : Inventory view should show default foldres (i.e. expand My Inventory)
2009-11-11 19:13:33 -05:00
bea3b937d9
Fix a potential crash if scroll button is not there
2009-11-11 16:12:25 -08:00
e3356c0695
some minor changes based on Richard's code review
...
Code Collab #34
2009-11-11 16:07:02 -08:00
9245322706
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-11-11 18:57:12 -05:00
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
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
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
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
afb49ed36e
Fix bad XML causing UI images not to load.
2009-11-11 15:09:28 -08:00
9fe4b5a3c1
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
2009-11-11 15:08:22 -08:00
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
Nyx (Neal Orman)