64f80748e7
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
2020-05-18 21:50:17 +02:00
9751942372
Small Cleanup
2020-05-18 18:33:08 +03:00
c764079389
Merge viewer-neko
2019-02-14 21:21:38 +01:00
af0e498293
SL-10338 FIXED The “add friend” button is available when user is already at your friends list
2019-01-21 17:45:26 +02:00
e41bdfc820
Merge viewer-neko
2017-12-20 23:07:38 +01:00
fbbac52dd9
MAINT-8044 Fixed crash in LLFloaterIMNearbyChatToastPanel::init();
...
algorythmic improvement for MAINT-6891
2017-12-08 19:58:01 +02:00
c182741596
Merge viewer-lynx
2016-11-16 09:55:54 +01:00
51bef9ed46
MAINT-6891 Chat longer than "fade after n lines" doesn't show except in chat history
2016-11-11 11:18:31 +02:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
f4bfb1aadf
Merge LL V3.7.9 (AIS3 + SSA)
2014-10-22 02:02:08 +02:00
72dba8742c
MAINT-4070 FIXED Use icon in urls when content is trusted.
2014-05-28 13:20:12 +03:00
148fc99607
FIRE-13898: Opening nearby chat by clicking a nearby chat toast results in multiple tabs shown simultaneously
2014-05-30 19:24:12 +02:00
9da29e2ccc
CHUI-983 FIXED Call showHistory() after clicking toast as it was before. Minor change in showHistory()
2013-06-26 19:23:00 +03:00
452832b26f
CHUI-976 FIXED Correct way to show Nearby chat is used now.
2013-06-12 15:05:15 +03:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
5a8d94c50f
Merge LL 3.6.4 pass 1
2013-08-28 00:10:39 -07:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
1f413c33ea
FS communication UI: Build fix in llchatitemscontainerctrl.cpp
2013-06-29 11:05:34 +02:00
14001c54df
Gastly CHUI merge pass 1, don't count on anything to work.
2013-06-26 12:14:54 -07:00
a9ffc0120a
Merged with default tip (Revision 13149a524874)
...
--HG--
branch : RLVa
2013-05-06 23:54:58 +02:00
486bdf3284
CHUI-337 FIXED: To avoid confusion with a classes "...conversation..." and in accordance with the naming convention in the project, some classes and corresponding files should be renamed:
...
LLIMConversation -> LLFloaterIMSessionTab
LLIMFloater -> LLFloaterIMSession
LLNearbyChat -> LLFloaterIMNearbyChat
LLIMFloaterContainer -> LLFloaterIMContainer
LLNearbyChatBarListener -> LLFloaterIMNearbyChatListener
LLNearbyChatHandler -> LLFloaterIMNearbyChatHandler
2012-11-09 12:45:36 +02:00
ae2e611dfb
CHUI-315 (Nearby chat messages do not appear in conversation floater): cancelled inheritance LLNearbyChat from LLSingleton; set mSingleInstance flag for it.
2012-08-31 16:52:50 +03:00
14708a3ace
CHUI_310 make NearbyChat a singletone
2012-08-22 18:27:29 +03:00
63ef2950e9
CHUI preparation phase 1: Move FS-specific communication parts into a separate domain and out of the way for CHUI merge to reduce conflicts
...
* LLChatHistory moved to FSChatHistory
* LLFloaterNearbyChat moved to FSFloaterNearbyChat
* LLIMFloater moved to FSFloaterIM
* LLIMFloaterContainer moved to FSFloaterIMContainer
* LLNearbyChatbarListener moved to FSNearbyChatbarListener
* LLNearbyChatControl moved to FSNearbyChatControl
* LLNearbyChatHub moved to FSNearbyChatHub
* floater_im_container.xml moved to floater_fs_im_container.xml
* floater_im_session.xml moved to floater_fs_im_session.xml
* floater_nearby_chat.xml moved to floater_fs_nearby_chat.xml
* widget chat_history.xml moved to fs_chat_history
* widget nearby_chat_control.xml moved to fs_nearby_chat_control.xml
2013-02-28 18:57:38 +01:00
f22e5df8b6
CHUI-172 WIP Fixed drawing the nearby chat toast contents.
...
Fixed warnings when creating a nearby chat toast.
2012-07-02 17:46:34 +03:00
5d0dbff1e4
FIRE-3152: Added "huge" font size option for chat window and console, enlarged it a little in Contact Sets
2012-08-27 21:07:55 +02:00
bba0f4f74e
CHUI-119 WIP
2012-05-31 16:37:22 +03:00
296e55c1b3
CHUI-112 FIX Clicking Show or Discard in an inventory offer toast does not dismiss toast
...
removed special case logic for dealing with user online/offline collisions
added ability to cancel old duplicate notifications
2012-05-18 13:20:32 -07:00
8ab7f87d53
Merged with RLVa-1.4.6 tip
2012-06-27 16:40:29 +02:00
23ee2e32d4
Open nearby chat container when clicking on nearby chat toasts and chat history is docked; fixes FIRE-6265
2012-05-12 13:09:51 +02:00
906dea62dc
Nearby chat working, toolbar layouts mostly behaving.
2012-01-27 23:29:53 +01:00
565b20d14b
- fixed : clicking chat toasts opens the speaking resident's profile when @shownames=n restricted
...
--HG--
branch : RLVa
2011-12-13 13:26:11 +00:00
161c1b019f
Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip)
...
Observations and broken stuff so far:
- LLSideTray is gone.
- LLBottomTray is gone.
- LLFloaterSnapshot was changed and gave lots of merge conflicts. Flickr upload will be broken.
- LLNearbyChat is derived from LLPanel now. That broke quite some stuff rearding autohiding and docking of chatbar.
- Profile floaters are gone and all web based now.
- Russian translation gave huge mere conflicts with the new russian xml files from LL. Unmergeable. I took the LL files.
- XUI files in general will need some love and testing.
2012-01-17 17:57:52 +01:00
866eeb7897
Merged with default tip (Revision 913d90c3225b)
...
--HG--
branch : RLVa
2011-11-04 17:40:17 +01:00
9f0890fc3a
EXP-1293 Nearby chat toasts no longer appear.
...
EXP-1316 Minimized Snapshot floater has a snapshot preview image attached below.
EXP-1318 Clicking on nearby chat toasts should bring up Nearby Chat history
2011-10-11 16:17:23 -07:00
a713ffa247
Merged with default tip (Revision ddfc2ed6aee1)
...
--HG--
branch : RLVa
2011-05-25 13:37:12 +02:00
df450ff17b
STORM-1021 ADDITIONAL_FIX Replaced usual object inspector with the remote one in nearby chat toasts.
2011-03-23 22:58:49 +02:00
604345b918
Merged with .RLVa tip
...
--HG--
branch : RLVa
2011-02-19 01:12:23 +01:00
c389577a0c
STORM-578 FIXED using the color setting for "URLs" from Preferences for names in Nearby Chat toasts.
2010-12-09 01:04:57 +02:00
c1e2223e50
Merged with default tip (Revision dc6483491b4a)
...
--HG--
branch : RLVa
2010-12-05 01:50:09 +01:00
b7afbcbc97
STORM-578 FIXED SLURL to object or user name in nearby chat toast now uses the font color selected in Preferences->Chat.
...
Removed unused "ChatToastAgentNameColor" setting from colors.xml.
2010-11-11 00:17:59 +02:00
9498c31d3c
Merged with default tip (Revision aeb7e6c38341)
...
--HG--
branch : RLVa
2010-10-31 23:41:40 +01:00
1c2ef4090a
Merged with default tip (Revision f20bf424bd86)
...
--HG--
branch : RLVa
2010-10-30 17:28:00 +02:00
e277b8a4ac
Merge with LL 2.6.9, initial work. Needs tests, extra XUI merging with particular skins.
2011-08-04 11:53:40 -04:00
b8eeb96c56
Made italic style /me emotes optional
2011-06-26 00:48:17 +02:00
d97355a19f
STORM-390 FIXED "Place Profile" appeared instead of "Resident Profile" after clicking on user name in a nearby chat toast.
...
Now clicking an avatar name opens avatar profile; clicking an object name opens object inspector.
This change rolls back the fix of STORM-358.
2010-10-19 19:55:19 +03:00
bf699333fa
STORM-358 FIXED Disabled higlighting URLs in object names inside nearby chat toasts.
2010-10-12 13:31:19 +03:00
b62b10dd26
Post-convert merge by convert_monolith.py from ./viewer-experience
2010-08-27 16:58:33 -07:00
73ff8eb78b
- review : tidied up a few RLVa code tags
...
--HG--
branch : RLVa
2010-08-25 16:30:04 +02:00
Ansariel