Commit Graph

40429 Commits (bd008a170898e69beeb8bc0481b4bfd94de86c55)

Author SHA1 Message Date
richard b7740ee0c5 unbreak build 2009-11-11 13:06:14 -08:00
Vadim Savchuk db3991ca23 Merge from default branch
--HG--
branch : product-engine
2009-11-11 22:55:32 +02:00
Rick Pasetto 0f8c6e95cd Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0 2009-11-11 12:42:16 -08:00
richard b34ee7f9f4 merge 2009-11-11 12:21:23 -08:00
richard 0a095bdaed added stylized text to tooltips for showxuinames 2009-11-11 12:19:54 -08:00
richard fedf86c216 fix wrapping of text segment containing multiple newlines and ending on a newline
reviewed by leyla
2009-11-11 12:01:57 -08:00
richard 854e2eaf9a added viewports to LLRenderTarget to speed up animation of sidetray
reviewed by Leyla
2009-11-11 12:01:17 -08:00
Loren Shih 0cc89785d6 merge 2009-11-11 14:34:06 -05:00
Rick Pasetto f8ba8b09a6 merge 2009-11-11 11:26:19 -08:00
richard abc76784d5 EXT-2382 - fix for clipping of minimap 2009-11-11 11:19:37 -08:00
Vadim Savchuk 2fd51b4c71 Manual merge.
Resolved conflicts in panel_bottomtray.xml and llavataractions.cpp.

--HG--
branch : product-engine
2009-11-11 21:11:54 +02:00
James Cook 41a2849a20 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-11 10:56:37 -08:00
James Cook a758a799cf Add widgets/ui_ctrl.xml that can set default font size across all widgets.
Individual widgets/*.xml files will need to have explicit font="foo" params
removed to start using the defaults.
Discussed with Richard.
2009-11-11 10:56:31 -08:00
Brad Payne (Vir Linden) cde62c0383 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-11 13:07:19 -05:00
Tofu Linden cc864d86ce outgoing call dialog. doesn't do anything and is ugly/wrong, but it exists. WIP. 2009-11-11 18:06:44 +00:00
Loren Shih cfcab50603 merge 2009-11-11 12:43:53 -05:00
Loren Shih 5bb5333964 EXT-2377 : Add XML switch to showing either menubar or gear menu
First pass attempt at this.  This is not debugged, but hg won't let me merge until I commit this change...
2009-11-11 12:42:39 -05:00
brad kittenbrink d4846af9fb Fix for DLL linkage error in new LLEventAPI class. 2009-11-11 12:30:23 -05:00
Eugene Kondrashev 196e350629 Additional fix for EXT-2137-[BSI] Copy/pasted text chat logs are now much harder to read or post-process.
--HG--
branch : product-engine
2009-11-11 19:26:19 +02:00
Igor Borovkov aa15d6016f merge
--HG--
branch : product-engine
2009-11-11 19:23:39 +02:00
Igor Borovkov 14c668bb97 fixed reopened subtask EXT-2265 IM unread messages counter should not be increased for system messages (comming from "Second Life", zero uuid)
now not counting messages with from = "Second Life" and from_id = receiver's uuid

--HG--
branch : product-engine
2009-11-11 19:19:07 +02:00
Tofu Linden a0dd5b825b merge. 2009-11-11 17:00:30 +00:00
Tofu Linden 0d01300762 sketch-out the outgoing call dialog code. WIP. 2009-11-11 16:59:49 +00:00
Mike Antipov b112b9ae75 merge
--HG--
branch : product-engine
2009-11-11 18:50:07 +02:00
Andrew Dyukov b8a672adaf Fixed low bug EXT-1499 (Finalize the Home panel and add tooltips to the tab grabs).
--HG--
branch : product-engine
2009-11-11 18:49:23 +02:00
Lynx Linden 4c3878ee92 Automated merge with ssh://hg.lindenlab.com/moss/viewer2voiceparity/ 2009-11-11 16:45:44 +00:00
Brad Payne (Vir Linden) ec81a548c5 Link spam reduction - consolidating inventory cache loading messages. 2009-11-11 11:45:20 -05:00
Tofu Linden 71fd3852b0 create an outgoing call floater, WIP. 2009-11-11 16:38:47 +00:00
Dmitry Oleshko 8a2da9a6b5 fixed low bug (EXT-573) There is paragraph indent in the toasts text
--HG--
branch : product-engine
2009-11-11 18:19:52 +02:00
Mike Antipov ee759fb32e merge
--HG--
branch : product-engine
2009-11-11 18:12:32 +02:00
Mike Antipov b360b994a8 Fixed major bug EXT-2205 (Message well counter is truncated)
- place counter exactly over the message well icon.

Fixed in theis way becouse style guide does not have correct UI.
Probably color sheme should be changes to have counter more visible

--HG--
branch : product-engine
2009-11-11 17:57:17 +02:00
Vadim Savchuk 6146cfc5c1 Merge from default branch
--HG--
branch : product-engine
2009-11-11 17:47:20 +02:00
Alexei Arabadji 8dacef13c0 Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG--
branch : product-engine
2009-11-11 17:45:34 +02:00
Lynx Linden 23a4637216 DEV-41324 DEV-41317: Fixes for P2P chat when already chatting. 2009-11-11 15:45:24 +00:00
Alexei Arabadji 3176622afe fixed EXT-2353 "IM window should auto-undock when dragged"
made all dockable floaters undock on dragging;

--HG--
branch : product-engine
2009-11-11 17:45:14 +02:00
Loren Shih 652c8f6b5e merge 2009-11-11 10:44:39 -05:00
Eugene Kondrashev 88f71ead30 Implemented Low sub-task EXT-2366-ALL Avatar specific buttons on IM P2P control panel should be disabled when interacting with AVALINE caller
--HG--
branch : product-engine
2009-11-11 17:34:08 +02:00
Tofu Linden 463571f1aa Default to voice control being a 'toggle', per spec. 2009-11-11 15:18:36 +00:00
Yuri Chebotarev 5f8771ea9e merge
--HG--
branch : product-engine
2009-11-11 17:06:35 +02:00
Yuri Chebotarev 8523d2d5b6 fix for normal bug EXT-2303 Distinguish Object-generated Nearby Chat from other Nearby Chat
--HG--
branch : product-engine
2009-11-11 17:05:36 +02:00
Mike Antipov 51d35efa23 Work on major sub-task EXT-991 (Update bottom bar behavior on resize)
Code cleaned up:
  - removed test code to show background in chiclet panel

--HG--
branch : product-engine
2009-11-11 17:05:31 +02:00
Igor Borovkov 73bba2bab4 implemented EXT-2363 Get rid of 'Friends Conference' hardcode and rename it to 'Ad-hoc Conference'
--HG--
branch : product-engine
2009-11-11 16:56:13 +02:00
Mike Antipov 454c02102c Work on major sub-task EXT-991 (Update bottom bar behavior on resize)
Code refactored:
  - moved code to process width increasing into separate method

--HG--
branch : product-engine
2009-11-11 16:42:18 +02:00
Mike Antipov 3862e97219 Work on major sub-task EXT-991 (Update bottom bar behavior on resize)
Code refactored:
  - processShowButton() now gets type of buttons should be shown instead of object
  - removed unnecessary code

--HG--
branch : product-engine
2009-11-11 16:17:29 +02:00
Eugene Kondrashev 61fdd33f79 Fixed Low bug EXT-1052-IM message window show messages, that were sent in offline mode
--HG--
branch : product-engine
2009-11-11 16:11:57 +02:00
Eugene Kondrashev 5ca8c5f61d Fixed normal bug EXT-2166-[BSI] Nearby Chat floater always jumps to most recent chat
--HG--
branch : product-engine
2009-11-11 15:48:55 +02:00
Yuri Chebotarev 9a88d4b02d merge
--HG--
branch : product-engine
2009-11-11 15:28:24 +02:00
Yuri Chebotarev ef721de720 fix for major bug EXT-2219 New Group profile layout breaks...everything
lots of small problems...

--HG--
branch : product-engine
2009-11-11 15:27:50 +02:00
Eugene Kondrashev 7123f0d447 Additional fix for normal bug EXT-2131-[BSI] Copy/pasted text chat logs are now much harder to read or post-process
--HG--
branch : product-engine
2009-11-11 15:27:42 +02:00
Eugene Kondrashev 249af0bf9d Fixed normal bug EXT-2131-[BSI] Copy/pasted text chat logs are now much harder to read or post-process
--HG--
branch : product-engine
2009-11-11 15:08:49 +02:00