e15002a11c
merge changes for 3.7.9-release
2014-06-16 11:42:37 -04:00
72dba8742c
MAINT-4070 FIXED Use icon in urls when content is trusted.
2014-05-28 13:20:12 +03:00
a98b4b6bee
merge changes for 3.7.7-release
2014-05-07 11:09:04 -04:00
e9116575bf
OPEN-209: Corrected all instances of trigraphs in the code.
...
Trigraphs can cause some real special headaches. The only part that's annoying is the comment in newview/llimview.cpp where there's an unfortunate collision of a trigraph sequence with a character sequence that could be displayed by the viewer. Thankfully, it's only a comment!
2014-03-13 20:36:05 -07:00
5b846ed2a6
merge with release
2014-03-12 12:48:43 -07:00
d7b902d575
[MAINT-3555] Crash in LLPanel::~LLPanel() on shutdown
...
- Added clear() after DeletePointer() call to hopfully fix this...
2014-02-14 13:56:36 -08:00
391ac367d6
SH-4634 FIX Interesting: Viewer crashes when receiving teleport offer
...
renamed fast timers to have unique names, changes instance tracker to never allow duplicates
2013-11-19 17:40:44 -08:00
17e9c872ad
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-11-11 19:17:49 -08:00
dc60a7564a
SH-4577 WIP Interesting: viewer crashed when clicking a offline Conversation containing a shared object
...
potential fix by making instance tracker allow key collisions for LLToastNotifyPanel
changed assertion macro to use original unpreprocessed source code
renamed instance tracker behavior macros to use LL prefix
added RestoreCameraPosOnLogin setting to optionally restore old camera positioning behavior
2013-10-24 14:37:57 -07:00
19f20baffb
MAINT-2575 FIXED Resident can accept unlimited number of friendship requests if they were sent before his first accept
2013-08-23 20:31:02 +03:00
e71e30aea0
MAINT-3174 (When resident is sharing some item with you, there is no context menu in IM conversation.)
2013-10-01 11:06:44 +03:00
ee2fce8790
Merge downstream code and viewer-beta
2013-05-09 14:10:45 -07:00
87ba85eaab
diff -r 59c7bed66dfd indra/llcommon/lleventapi.h
2013-04-24 09:35:38 -07:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
b42b789723
Merge in downstream code (chui fixes, materials)
2013-04-11 16:18:34 -07:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
d5561a1ada
Merge in viewer-beta to get CHUI code
2013-03-19 16:20:53 -07:00
207d9fd767
Viewer-chui merge
2013-03-11 14:45:53 -04:00
30248c2049
CHUI-695: When the 'Accept' button is pressed the toast panel will be resized to the conversation floater dimensions after all buttons and text has been added to the toast panel
2013-02-13 17:01:26 -08:00
a33104ec55
CHUI-695: Viewer crash when accepting friend offer in conversations window. Problem was that LLIMToastNotifyPanel::snapToMessageHeight was calling LLToastPanel::reshape, which would then call LLIMToastNotifyPanel::reshape again. Resolution: Modified LLIMToastNotifyPanel::snapToMessageHeight to cleanly replicate what LLToastPanel::reshape was doing.
2013-02-12 19:26:24 -08:00
a034c272c3
CHUI-747: Script buttons in a toast overlap message text. Problem was due to the message container not being shifted upward when buttons were added to the control buttons container (which is beneath the message container). A small change in CHUI-695 caused this.
2013-02-08 18:12:26 -08:00
85f7f43069
CHUI-695 FIXED Viewer crashes after attempt to accept a friendship in IM
2013-02-04 19:11:17 +02:00
daa9db305a
CHUI-695 Viewer crashes after attempt to accept a friendship in IM: remove an infinity loop of reshape()
2013-01-23 19:47:01 +02:00
5083517c7c
CHUI-292 FIX Extra space in object chiclet toasts in CHUI viewer compared with release viewer
...
In LLToastNotifyPanel, moved mInfoPanel->SetFollowsAll() immediately before call to snapToMessageHeight() as was previously the case in release viewer
2013-01-17 01:57:19 +00:00
974720373d
CHUI-660: Problem: Upon auto-existing DND mode upon startup, the notification form elements (buttonts) were added to the form. But then deserialized form elements were also being added to the form causing duplicate buttons. As a solution, only add on the deserialized form elements that exceed the amount in the template.
2013-01-08 12:21:47 -08:00
89f7335a52
CHUI-489: Found a bug in last commit for this issue. The sound notification (for inventory/teleport offer) would be played for the toast popup as well as once the conversations floater was opened. And also when a button was clicked in the conversation floater to 'accept' or 'deny' the offer. Now only playing the sound notification when the initial offer has been made.
2012-11-15 17:34:34 -08:00
d3474c6eaf
CHUI-489: Now sounds exist for teleport and inventory offers. The sound is specified in notifications.xml. Also changes for CHUI 486, which allow the user to set preferences for hearing sounds for a New Conversation, Incoming Voice Call, Teleport Offer and Inventory Offer.
2012-11-15 15:42:22 -08:00
c9044c03b3
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
2012-11-09 18:51:23 -08: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
c06c35609c
Updating linux build to gcc4.6
2012-10-11 00:09:04 +00:00
df93749819
merge up to latest viewer-development
2012-07-31 14:55:15 -04:00
3e038cd71b
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
2012-07-27 12:53:54 -07:00
764d1e3caf
merge up to 3.3.3-release
2012-06-28 10:35:22 -04:00
f64a79d9d1
merge changes for DRTVWR-171
2012-06-21 14:19:25 -04:00
614148077d
STORM-1844: Block and Ignore buttons on llDialog() menus overlap when there is only one button
2012-06-18 10:19:37 +02:00
68c3d1bb2e
EXP-1953: First pass at implementing the maturity flow during a teleport via lure.
2012-06-08 18:28:19 -07:00
bc54f1bb89
Merge : pull from lindenlab/viewer-release
2012-06-07 22:30:54 -07:00
1f0addf6e4
merge changes for DRTVWR-152
2012-05-22 16:26:00 -04:00
723f596bf6
Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui
2012-05-21 17:16:34 -07:00
61bc25211b
CHUI-111 FIX Saved notifications are not sorted in same order after logout and relog.
...
sort notifications in separate list
llnotification now uses param block to serialize to llsd
2012-05-21 17:16:11 -07:00
32717690ee
gcc build fix.
2012-05-21 17:45:28 +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
f4edcdd409
MAINT-938 FIXED (Make debit-permissions dialog give a stronger warning)
...
- Added new tag called "footer" to the notification. This tag allows to display messages under the buttons in toasts.
- Created new class LLToastScriptQuestion for the "ScriptQuestionCaution" notification. This notification supports tag <footer>.
2012-05-17 21:02:53 +03:00
129a522235
STORM-1822 Change size of Block button in dialog boxes to help prevent accidental clicks
2012-03-22 12:29:03 -04:00
1ea65f0285
CHUI-51 WIP notifications routig code cleanup
...
phase 1, removal of most of llnotificationhandler
2012-03-27 22:56:02 -07:00
30527b2206
EXP-1409 FIX WASD controls don't move avatar while Move floater is in focus
...
moved "chrome" flags to xui
separated hiding floater title from setting chrome
toolbar toggle button now moves floaters to frontmost and doesn't necessarily rely on focus
2011-10-18 14:09:52 -07:00
1f486a9515
STORM-1567 Mute button for llDialog popup
...
Made changes per RB feedback.
2011-08-26 12:11:57 -04:00
541e26d947
STORM-1567 Mute button for llDialog popup
...
Updating patch to current version of viewer-development
2011-08-23 07:55:34 -04:00
287c3fcffc
STORM-433 FIXED Fixed reshaping notification panel with friendship offer when it is inserted into IM chat.
2011-02-04 21:01:01 +02:00
ace8964cf5
more de-crufting.
2010-09-30 11:13:02 +01:00
Oz Linden