Igor Borovkov
0bd034c56a
fixed EXT-3250 There should be no "Group info" button for Ad-hoc conference
...
caused by misdetection of IM type
--HG--
branch : product-engine
2009-12-10 15:42:54 +02:00
Andrew Polunin
d24fec9b90
fixed normal bug EXT-3284 \"Share\" ability is disabled in context menu in \"Nearby\", \"Friends\" and \"Recent\" tabs
...
--HG--
branch : product-engine
2009-12-10 15:28:51 +02:00
Mike Antipov
e8d3afc99c
Work on major task EXT-2808 (Add speakers moderation (both voice and text) to the Voice Control Panel (Active Speakers List))
...
-- Refactored moderating of text & voice chats to use the only LLHTTPClient::Responder class
-- added doxygen comments for voice moderation functions
--HG--
branch : product-engine
2009-12-10 15:15:45 +02:00
Mike Antipov
08c0d3876b
Work on major task EXT-2808 (Add speakers moderation (both voice and text) to the Voice Control Panel (Active Speakers List))
...
-- Implemented Actions to Mute/Unmute Participants without using Agent's Block List
-- Updated missing strings to show error while moderating
--HG--
branch : product-engine
2009-12-10 14:45:41 +02:00
Andrew Dyukov
4df594defc
Set temporal icon for "Scripting disabled" in navbar (EXT-3339).
...
Finding appropriate icon is left to Erica.
--HG--
branch : product-engine
2009-12-10 14:22:25 +02:00
Andrew Polunin
9d5c05074d
implemented normal task EXT-2767 IM chiclet needs hard-coded reference to icn_voice-localchat.tga changed to Unread_IM
...
--HG--
branch : product-engine
2009-12-10 13:39:26 +02:00
Alexei Arabadji
e8a713f820
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
...
--HG--
branch : product-engine
2009-12-10 12:37:02 +02:00
Alexei Arabadji
e9afce6786
mplemented EXT-2801 “Record "object return" notification into IM history, not
...
chat history”,
added logging to IM for ServerObjectMessage notification;
--HG--
branch : product-engine
2009-12-10 12:36:28 +02:00
Mike Antipov
02498f1963
Work on major task EXT-2808 (Add speakers moderation (both voice and text) to the Voice Control Panel (Active Speakers List))
...
-- Added menu items, disabling them not in the group call
-- Also refactored Mute Text functionality to be used in Block/Unblock menu item (For EXT-2863)
--HG--
branch : product-engine
2009-12-10 12:22:55 +02:00
Lynx Linden
3497f64b12
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2009-12-10 09:20:33 +00:00
James Cook
2fa8c6f3da
Merge
2009-12-09 18:27:38 -08:00
James Cook
4cca7eb425
EXT-299 "Mute" still showing in menu_pie_avatar.xml although label says "Block"
2009-12-09 18:26:34 -08:00
Steve Bennetts
562d343c47
EXT-3298 world map does not load simulator textures
...
Forgot to add LLCurl update call to non threaded LLTextureFetch update.
2009-12-09 18:18:01 -08:00
richard
6fae49dc2a
Merge
2009-12-09 17:42:44 -08:00
richard
6408298aad
EXT-3112 - Bad font width information with SansSerif causing clipping of trailing "r"?
...
better handling of ui scale != 1
reviewed by Mani
2009-12-09 17:41:42 -08:00
Nyx (Neal Orman)
152010b8c6
EXT-3063 cleanup of inventory item properties sidepanel
...
step 1: kill the edit button
step 2: disable info button on main inventory panel if more than one item is
selected.
other steps to be done will be filed as separate jiras
code reviewed by seraph
--HG--
branch : avatar-pipeline
2009-12-09 20:26:20 -05:00
Eric M. Tulla (BigPapi)
c971462f6e
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-12-09 20:25:18 -05:00
Eric M. Tulla (BigPapi)
272bb744af
Fix for save texture functionality no longer respecting permissions
2009-12-09 20:24:37 -05:00
richard
23610472d5
lazy evaluation of lluistring to improve LLUIString::format performance
...
reviewed by Mani
2009-12-09 17:17:07 -08:00
James Cook
42120752bd
Cleanup unneeded topleft attributes, document similar menu files
2009-12-09 16:58:49 -08:00
Mark Palange (Mani)
d8d6a6d1b7
merge
2009-12-09 16:39:10 -08:00
Mark Palange (Mani)
9f68163179
EXT-2896 Fixed poor handling of login error.
...
Added more cleanup to the reset_login call.
Added new settings to control UseCircuitCode message timeouts to allow testing of this failure.
Reviewed by Richard
2009-12-09 16:38:37 -08:00
Loren Shih
ac4a6c93f0
EXT-3303 : Crash on select object inventory root folder and hover Build menu
...
Unsafe cast (which has existed since viewer1.23) was causing crash.
2009-12-09 19:37:58 -05:00
James Cook
dab87201cd
Partial EXT-3268 Object Profile option showing up in avatar 3D Context menu
...
Renamed gPie* and menu_pie_* to just gMenu* and menu_* because they are no
longer pie menus. Created separate other-attachment menus.
Reviewed with Richard.
2009-12-09 16:37:08 -08:00
Brad Payne (Vir Linden)
50a865e212
merge
...
--HG--
branch : avatar-pipeline
2009-12-09 19:15:30 -05:00
Brad Payne (Vir Linden)
522463108b
For EXT-2858: Determine gear menu / right-click menu choices for AppearanceSP
...
--HG--
branch : avatar-pipeline
2009-12-09 19:12:05 -05:00
James Cook
418f30d1cd
Merge
2009-12-09 14:58:49 -08:00
callum
a97479f41b
Merge with head
2009-12-09 14:56:48 -08:00
Tofu Linden
9abe779c8a
last blind fixup for llmediaplugintest.
2009-12-09 14:55:45 -08:00
callum
dc3cad90c1
Bunch of simple UI changes:
...
DEV-43885 EXT-3206: Number of media items UI in Nearby Media Floater clipped when there are a lot
DEV-43884 EXT-3207: In Build Dialog, Under Texture Tab, should say "Media" and not "Media URL"
DEV-43877 EXT-3221: Warning message about whitelists in Security Tab of Media settings floater appears incorrectly
DEV-43875 EXT-3224: Media Text Box in the Build settings: Texture should be a label and not a text box
DEV-43477 Popup for adding media to only one face is misleading
Reviewed by Sam
2009-12-09 14:55:17 -08:00
Lis Pardi
43b71ced90
Automated merge with ssh://lis@hg.lindenlab.com/james/gooey
2009-12-09 17:51:44 -05:00
Lis Pardi
201e8419ee
ext-3297 Input/Output Devices are cut off in Preferences
2009-12-09 17:51:33 -05:00
Tofu Linden
9b0825be5c
get llmediaplugintest compiling on win32, dumbly.
2009-12-09 14:48:36 -08:00
James Cook
ca2566a1ac
Merge
2009-12-09 14:36:52 -08:00
Tofu Linden
05e0d9d24a
Re-disable a very spewy debug spew in the webkit plugin. Mea culpa.
2009-12-09 14:36:45 -08:00
Erica
6dd56fddd7
Automated merge with ssh://hg.lindenlab.com/james/gooey
2009-12-09 14:34:45 -08:00
Erica
2a1e3b48f9
Crash fix due to bad duplicated attributes in xui
2009-12-09 14:34:26 -08:00
Eric M. Tulla (BigPapi)
6e95fbd3c3
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-12-09 17:25:29 -05:00
Tofu Linden
204ae550d8
blindly fix-up llmediaplugintest.cpp with respect to the recent API change.
2009-12-09 13:59:51 -08:00
Tofu Linden
2554a88ec1
merge!
2009-12-09 13:46:05 -08:00
James Cook
7466aa198a
Merge
2009-12-09 13:42:07 -08:00
Lis Pardi
1c0b5d4435
Automated merge with ssh://lis@hg.lindenlab.com/james/gooey
2009-12-09 16:35:15 -05:00
Lis Pardi
3b36b1fd2a
ext-2976 change "alerts" to read "notifications"
2009-12-09 16:35:05 -05:00
Eric M. Tulla (BigPapi)
dc8365ff00
Fix for EXT-2703 & EXT-2708 - save texture as issues
...
Added save as to texture preview floater. Fixed behavior of save as (was only working for textures, not snapshots).
Removed advanced menu entry for save texture as (refused to work after multiple implementations).
2009-12-09 16:27:39 -05:00
James Cook
6260ce6a92
Merge
2009-12-09 13:24:21 -08:00
Tofu Linden
2af183c51d
remove LL_PATH_BROWSER_PROFILE
...
it really has no point now - it's not used by the viewer, and the webkit plugin's private space should be opaque to the viewer.
2009-12-09 13:20:25 -08:00
James Cook
7193e97b98
Fix line endings.
2009-12-09 13:14:04 -08:00
James Cook
627bdb5bd4
Merge
2009-12-09 13:11:20 -08:00
Leyla Farazha
0c1d9da1c1
merge
2010-12-08 11:58:16 -08:00
Leyla Farazha
52dd4daada
adding notes about visible / enable callback registries being merged
2010-12-08 11:56:44 -08:00