fc70ca5403
PE merge.
2010-02-03 15:52:44 +00:00
cb03e6f92a
fixed EXT-4776 Make avatars in nearby chat inspectable
...
--HG--
branch : product-engine
2010-02-03 16:25:32 +02:00
5e63efe1da
fixed EXT-4805 “Friend offer is corrupted in resized IM window”,
...
reverted IM floater default width;
made offer buttons have absolute positions;
avoided text message scrolling with default IM floater width;
--HG--
branch : product-engine
2010-02-03 11:38:03 +02:00
e563a07659
DEV-32540: Lots of object IM and SLurl improvements
...
- Don't let object names that are URLs override links to display the
remote object inspector
- Don't hyperlink the object name in the remote object inspector
- Made the <nolink>...</nolink> regex more robust and made it support
non-URLs between the tags, so that we don't get random <nolink> tags
when trying to disable URLs in user-typed text.
- Improved the llurlentry unit test and added some more test cases.
- Hooked up another LLViewerMessage code path to objectim SLapps to
pass down the owner and slurl information.
- Made a few LLUrlEntryBase methods be const methods, because they are
- Fixed a bug in the remote object inspector where it would never show
the teleport URL.
2010-02-02 17:19:14 +00:00
45e700cb3e
merge
2010-02-01 12:39:59 -08:00
159c788918
merge
...
--HG--
branch : product-engine
2010-01-29 18:03:23 +02:00
86609394ca
fixed major EXT-3643 “Embed friendship offer into IM window”;
...
--HG--
branch : product-engine
2010-01-29 17:48:10 +02:00
015453dbc7
fixed EXT-4736 There's an ability to block system notifications from nearby chat
...
--HG--
branch : product-engine
2010-01-29 17:04:17 +02:00
9997587e39
PE merge.
2010-01-28 09:56:35 -08:00
fee014bd82
EXT-4693: Pass through owner ID to remote object inspector.
...
Plumbing to pass the owner ID for a chatting object down into the
LLChatHistory::appendMessage() method where we create the objectim
SLapp that will bring up the remote object inspector. Pheww.
For object notifications that are displayed as text chat, we
2010-01-28 15:38:55 +00:00
f6fceac081
fixed EXT-3841 [BSI] "Send IM..." choosable in IM floater context menu
...
--HG--
branch : product-engine
2010-01-28 15:51:49 +02:00
d002c705b7
EXT-4693: First steps at using remote inspector.
...
Now Object IMs that get sent to your local chat window will have
secondlife:///app/objectim SLapps, which will open the remote object
inspector for that object, not the avatar inspector.
However, we don't have all the information needed for the remote
object inspector, so I'm going to have to investigate extending the
inspector to request the missing information from the server.
2010-01-28 11:10:10 +00:00
c555e837b1
EXT-4348 - List of names before "have said something new" wraps poorly
...
accepted patch from Josh
2010-01-25 15:55:12 -08:00
254b7d72d1
fixed EXT-4601 [BSI] New IM sessions use obsolete timestamps for first message
...
--HG--
branch : product-engine
2010-01-25 18:43:31 +02:00
fd3e2dc474
Fixed low bug EXT-3890([BSI] someone has said text cutoff when opening and closing user list)
...
--HG--
branch : product-engine
2010-01-19 21:44:04 +02:00
653b62e356
Fixed EXT-3818 [BSI] plain text chat has too much space between lines
...
by redoing fix for the EXT-3263 Cut and Paste from text chat loses new lines
--HG--
branch : product-engine
2010-01-19 13:23:51 +02:00
24d8bf26fc
Fixed normal bug EXT-4072([BSI] Emotes appear as (italic) text chat in plain text mode)
...
--HG--
branch : product-engine
2010-01-14 18:15:01 +02:00
37f55393e4
fixed EXT04137 BSI] /me shows on the line below in group chat in plain text
...
--HG--
branch : product-engine
2010-01-13 18:52:45 +02:00
d40c4f9b8e
fixed EXT-4073 [BSI] Shouting is malformed in plain chat mode
...
--HG--
branch : product-engine
2010-01-13 16:55:23 +02:00
0d09530d85
EXT-1847 Regression in the design spec: "You" should be replaced by your full avatar name in communication
2010-01-08 16:33:03 -08:00
1bbd259f2d
EXT-3878 - Menus disappear when UI Size is < 1.00
...
EXT-3647 - Auto-scrolling of IMs should resume when user types in chat
EXT-3877 - Pinning two levels of menus prevents movement using arrow keys
EXT-1303 - Hyperlink text wraps in the middle of a word
reviewed by James
2010-01-06 11:17:38 -08:00
c3f2859c9f
Reduced header dependency from the "llimview.h"
...
--HG--
branch : product-engine
2009-12-26 16:35:33 +02:00
18e25641fe
merge
2009-12-21 18:12:17 -08:00
c308dacfe2
don't show incoming system messages in notification at bottom of chat history window
2009-12-21 11:54:05 -08:00
5d8442f056
fix for build
2009-12-18 15:21:59 -08:00
2b22831dd0
ext-3307 - nearby chat stays scrolled at bottom
2009-12-18 15:18:16 -08:00
8e8b149718
fix for osx compile error
2009-12-18 17:05:45 -05:00
55ff23cdad
implemented major task EXT-3469 Make timestamp disappear instead of covering avatar name while IM floater is being resized
...
--HG--
branch : product-engine
2009-12-18 15:47:21 +02:00
e303864c17
Merge from default branch.
...
Resolved conflicts in llalertdialog.h and llnotify.cpp (local deletion vs
remote change) by removing them.
--HG--
branch : product-engine
2009-12-15 17:14:31 +02:00
c6234f352a
variable renames in LLTextBase
2009-12-11 14:34:30 -08:00
58f17bb735
Fixed normal bug EXT-3263 (Cut and Paste from text chat loses new lines)
...
--HG--
branch : product-engine
2009-12-11 20:26:20 +02:00
1147cb1afb
Automated merge from trunk
2010-03-01 18:09:04 -08:00
b11a625e6f
Automated merge with a few fixups for code review comments
2010-03-01 15:31:04 -08:00
a2efe4bb41
automated merge
2010-02-26 19:18:15 -08:00
13d4257868
automated merge
2010-02-26 12:02:34 -08:00
2d7697dfad
automated merge
2010-02-26 01:52:28 -08:00
5c73a90835
automated merge
2010-02-25 21:20:45 -08:00
9b05fecbf6
automated merge from trunk
2010-02-25 18:24:07 -08:00
96a11910b1
Fixed normal bug EXT-1710 (IM & Chat: System messages should have
...
SL icon and title). "i" icon is temporarily used, changing it in
xml to SL icon moved to new bug- EXT-3132.
--HG--
branch : product-engine
2009-12-04 13:46:58 +02:00
276b782b8c
Implemented normal sub-task EXT-3035 (Made other participants' names clickable in IM chat log (old school chat log style))
...
--HG--
branch : product-engine
2009-12-03 18:31:48 +02:00
003b6f1950
fix for normal EXT-2944 [BSI] Object chat and Resident chat is combined in Nearby Chat floater when object and Resident share the same name
...
--HG--
branch : product-engine
2009-12-03 09:23:53 +02:00
abb23ff312
Manual merge from default branch.
...
--HG--
branch : product-engine
2009-12-02 18:17:51 +02:00
4bf428c4ee
fix major EXT-3003 IM messages loaded from a chat history are displayed with current time
...
--HG--
branch : product-engine
2009-12-02 11:58:27 +02:00
f496c2b164
DEV-43622 : API change (no functionality change) to fix a design error in LLSD
...
I made it about a year and a half ago; Zero found it while reading code. I had added a return value to LLSD::insert(), but a) did it wrong, and b) broke the STL-like semantics of insert(). So I've put insert() back to returning void and created LLSD::with(), which does what my earlier insert() did. The compiler then caught all the cases where insert()'s return value were being used, and I changed those to use with() instead.
2009-12-01 20:59:08 -05:00
5358354869
Fixed Line endings to Unix format
...
--HG--
branch : product-engine
2009-11-30 11:48:47 +02:00
c83aa5ba6a
Fixed wrong type for getChild<LLTextBox>("user_name") to prevent WARNING logging.
...
--HG--
branch : product-engine
2009-11-30 11:41:00 +02:00
b884eede51
EXT-2831 Timestamps are missing in nearby chat toasts
...
--HG--
branch : product-engine
2009-11-26 12:58:14 +02:00
9e2d78aca1
Merge from product-engine
2009-11-24 12:42:14 -08:00
f9081220ac
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2009-11-24 08:47:13 -08:00
96199e2d90
Remove unnecessary log message
...
--HG--
branch : product-engine
2009-11-24 13:22:56 +02:00
67ef3059b5
Work on critical sub-task EXT-2615 (IM Chat History is severely broken)
...
-- Implemented fitting of the timestamp in Chat History header panel depend on time string width
--HG--
branch : product-engine
2009-11-24 13:20:31 +02:00
d93cece450
fix crash error for missing string RegisterDateFormat in panel_profile_user.xml
2009-11-24 15:01:51 +08:00
cfccf4d514
EXT-2780 allow_scroll = false in LLTextEditor will crash the viewer
2009-11-24 11:54:33 +08:00
9e403da7b0
Implemented major sub-task EXT-2517 (Add support for the viewer 1.23 chat history style (widget-less))
...
--HG--
branch : product-engine
2009-11-23 20:34:06 +02:00
dd9b1f819d
EXT-2297 Functionality Loss - Ability to copy (control+c) residents name from their profile & local chat
2009-11-23 17:33:03 +08:00
b3cb61a26a
Fixed major bug EXT-2532-IM timestamp is when message is viewed, not when it was sent and received. Time str from the arriving message used now instead of constructing it dynamicly.
...
--HG--
branch : product-engine
2009-11-18 17:57:47 +02:00
402e957c56
Merge from default branch.
...
Added missing trailing newline to fix Linux build.
--HG--
branch : product-engine
2009-11-17 16:36:22 +02:00
53be27e742
fox4 low task EXT-2480 Open Blocked List panel when blocking an object from nearby chat console
...
--HG--
branch : product-engine
2009-11-17 14:40:02 +02:00
0098bf40ea
undo the changes for LLStyle params; add sizeFromFont in LLFontGL ; use font.style, font.name and font.size params for font creating
2009-11-17 16:33:49 +08:00
1baf1d2186
fix chat format for /me
2009-11-16 20:46:40 +08:00
b3b608b2a8
Merge from product-engine
2009-11-13 10:17:56 -08:00
0c7a4b6a7d
EXT-2342 Script : Fails to work in Alpha 6
...
ok toast for objects are back...
also add object inspector to nearby chat object context menu
--HG--
branch : product-engine
2009-11-13 13:49:14 +02:00
d116185bfd
Fixed Low bug EXT-2404-Nearby Chat: There is redundant semicolon in the log for system messages
...
--HG--
branch : product-engine
2009-11-13 12:26:57 +02:00
a7b8b51a5a
Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/
2009-11-13 15:20:04 +08:00
01f1eaf7e0
fix style readonlycolor overwriting color
2009-11-13 15:19:37 +08:00
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
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
b4a3b65a60
fix merge error
2009-11-12 23:02:41 +08:00
ff09b049a7
merge
2009-11-12 21:36:34 +08:00
11fc2da6fa
make color and font affecting both nearby chat and toasts
2009-11-12 21:20:18 +08:00
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
5f8771ea9e
merge
...
--HG--
branch : product-engine
2009-11-11 17:06:35 +02:00
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
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
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
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
2afc64e6fa
Fixed Normal bug EXT-1959 - [BSI] emotes difficult to see in IM/Group chat
...
--HG--
branch : product-engine
2009-11-11 13:08:02 +02:00
4254d1e0f7
Implemented normal sub-task EXT-2146-IM Message Headers should NOT be of enourmous size (see Style Guide: IM & Voice).
...
--HG--
branch : product-engine
2009-11-05 17:10:09 +02:00
7d8c41b150
Fixed normal bug EXT-1935-[BSI] Reversion - clicking on avatar name in group chat should bring up profile
...
--HG--
branch : product-engine
2009-10-29 19:20:17 +02:00
19e99af208
fix normal bug EXT-1712 Nearby Chat: change context menu for objects
...
--HG--
branch : product-engine
2009-10-29 18:09:38 +02:00
7d87e55c54
Merge PE revisions 3765-3786 from https://hg.aws.productengine.com/secondlife/viewer-2-0/
2009-10-28 15:19:32 -07:00
bb9fe04b5f
EXT-1949 - Viewer freezes on resizing IM window
...
cleaned up some rectangle tracking logic and introduced LLInlineViewSegment param block
reviewed by Leyla
2009-10-28 11:48:10 -07:00
2663bad36b
merge from default
...
--HG--
branch : product-engine
2009-10-28 15:50:36 +02:00
26b7e61789
fix for normal bug: EXT-1713 Nearby Chat: Objects have tooltips (???)(???)
...
--HG--
branch : product-engine
2009-10-27 19:26:41 +02:00
42e29558db
EXT-1709 Nearby Chat: Avatar context menu can be triggered on avatar's icon only
...
--HG--
branch : product-engine
2009-10-27 18:12:27 +02:00
62c8f55e3e
working on EXT-1713,EXT-1712,EXT-1711,EXT-1709
...
EXT-1713 Nearby Chat: Objects have tooltips (???)(???)
EXT-1712 Nearby Chat: change context menu for objects
EXT-1711 Nearby Chat: context menu isn't applicable for system messages
EXT-1709 Nearby Chat: Avatar context menu can be triggered on avatar's icon only
initial commit - panel for message headers
--HG--
branch : product-engine
2009-10-27 11:28:46 +02:00
12c38ccd6a
Ext-1110 - Unable to select whole text by mouse in the text widget
2009-10-22 18:09:07 -07:00
b3d1eb82fa
fix for chat history layout bugs
...
EXT-1728 - there is no new line in the text copied on junction of 2 panels
EXT-1670 - fix chat history use of widgets
reviewed by James
2009-10-21 21:30:40 +00:00
ce5a5f84d5
ext-1670 - fix the chat history use of widgets
...
reviewed by leyla
2009-10-20 00:41:41 +00:00
8103710c05
Merging revisions 2046-2068 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry
...
* Bugs: EXT-1414 EXT-1213 EXT-1539 EXT-1253 EXT-1446 EXT-1438 EXT-1233 EXT-1466 EXT-1446 EXT-1512 EXT-1231
* Dev: EXT-719 (landmarks) EXT-747 EXT-1446 EXT-1378 EXT-397 EXT-1476
* IM changes
2009-10-19 01:45:44 +00:00
Tofu Linden