Commit Graph

661 Commits (c513ebb777b5345416683404454125cd94de838c)

Author SHA1 Message Date
Ansariel 47d9576f04 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-02-15 19:16:15 +01:00
Ansariel e4f0270887 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-02-15 11:41:48 +01:00
Zi Ree edc771b71a FIRE-30725 - Add more group functions to group URL context menu 2021-02-10 14:36:56 +01:00
Ansariel daec926a54 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-11-12 17:02:25 +01:00
Ansariel 602a82dc33 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-11-12 10:11:43 +01:00
Ansariel 22b2d0d4e0 Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer 2020-11-04 15:33:34 +01:00
Beq 571cf0d5cf FIRE-23523 Notifications with embeded URLs not clickable 2020-10-29 15:42:38 +00:00
Mnikolenko Productengine a74cadff83 SL-14149 FIXED The text is displayed black after double-clicking on it 2020-10-23 16:05:31 +03:00
Ansariel 3c16b5d369 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-10-15 15:12:16 +02:00
Ansariel 9f93f28aab Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-10-15 13:07:37 +02:00
Andrey Lihatskiy 42330f2008 Merge branch 'master' into DRTVWR-483 2020-10-14 22:01:05 +03:00
Andrey Lihatskiy b39ad7724f Merge branch 'master' into DRTVWR-515-maint 2020-10-14 22:00:20 +03:00
Andrey Lihatskiy 1d458de949 Merge branch 'master' into DRTVWR-515-maint
# Conflicts:
#	indra/newview/llpanelprimmediacontrols.cpp
2020-09-28 22:29:19 +03:00
Ansariel e6e844a0b9 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-09-23 14:01:45 +02:00
Ansariel efbb274251 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-09-23 07:33:20 +02:00
Ansariel 41ac9cb015 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-09-23 06:52:54 +02:00
Andrey Lihatskiy f4bfaeb45e Merge branch 'master' into DRTVWR-483 2020-09-23 01:48:13 +03:00
Andrey Kleshchev 730af5d488 Merged master (DRTVWR-503) into DRTVWR-482 2020-09-22 22:51:33 +03:00
Ansariel 240757c0d0 Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer 2020-08-20 16:52:04 +02:00
Ansariel b67e99e18a Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-08-20 10:44:28 +02:00
Ansariel 5f309fdcf7 More banging at name SLURL underlining on hover in chat history 2020-08-20 00:32:27 +02:00
Andrey Kleshchev e67e9f63c3 SL-13293 Fixed reshape behavior for scale change 2020-08-14 01:06:48 +03:00
Ansariel 67255f5d64 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-501 2020-07-29 13:23:00 +02:00
Ansariel db68f49ab5 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-07-28 21:01:43 +02:00
Ansariel 6578b9420d Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-07-28 20:01:43 +02:00
Ansariel 1dfcb2ddf6 Fix chat header color selection 2020-07-17 08:38:09 +02:00
Ansariel 6f32a43f08 Make avatar names in chat history use default URL font style except it's a moderator in group chat not using default font style 2020-07-16 17:51:59 +02:00
Ansariel a879e86b8e Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer 2020-05-19 21:53:26 +02:00
Ansariel b8f781d2ca Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep 2020-05-19 14:01:14 +02:00
Ansariel f7ab3b2f4b Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep 2020-05-19 12:26:21 +02:00
Mnikolenko Productengine 0828d7375a SL-12396 FIXED Last line can't be removed if it was selected via triple-clicking 2020-05-08 11:54:58 +03:00
Ansariel 4e98c504d0 FIRE-29545: Backspace not working after triple-click selecting last line 2020-05-08 09:32:40 +02:00
Andrey Lihatskiy ec9b989863 Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
# Conflicts:
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorypanel.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
2020-05-05 00:37:16 +03:00
Ansariel 10552d2459 Merge branch 'master' of D:/Dev/phoenix-firestorm-mesh-upload 2020-04-23 18:29:50 +02:00
Ansariel ddc7fc297b Merge branch 'master' of D:/Dev/phoenix-firestorm-legacy-profiles 2020-04-23 18:08:09 +02:00
maxim_productengine 44fe667661 SL-12396 Triple clicking text in a textbox / textarea should only select the current line 2020-04-11 22:48:18 +02:00
Ansariel 48854f714a Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-03-19 10:28:54 +01:00
Ansariel fc5f901ff5 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-03-19 09:29:44 +01:00
Andrey Lihatskiy dcb6b5489d Merge branch 'master' into DRTVWR-483 2020-03-18 21:06:02 +02:00
Andrey Lihatskiy 9ec2aac56c Merge branch 'master' into DRTVWR-482 2020-03-18 21:05:33 +02:00
maxim_productengine b9f0eb54ce SL-12396 Triple clicking text in a textbox / textarea should only select the current line 2020-02-12 12:45:56 +02:00
Ansariel 90cbec4a54 Merge DRTVWR-481 2020-02-08 18:43:22 +01:00
Andrey Lihatskiy d956c866cf Merge branch 'master' into DRTVWR-483 2020-02-05 18:33:53 +02:00
Andrey Lihatskiy 258cc9c61a Merge branch 'master' into DRTVWR-482 2020-02-05 18:31:06 +02:00
Brad Payne (Vir Linden) 38649767a0 Merge branch 'master' of https://bitbucket.org/lindenlab/viewer-private into DRTVWR-481
Merge
2020-01-28 21:47:35 +00:00
Ansariel 5f1aaa7108 Merge Firestorm LGPL 2019-12-13 22:27:53 +01:00
Ansariel f686d4f329 Merge viewer-legacy-profiles 2019-12-13 00:56:12 +01:00
Ansariel 8f3213d7d4 Merge Firestorm LGPL 2019-12-13 00:14:24 +01:00
maxim_productengine 3d5ffd0af3 SL-12003 FIXED Viewer Icons do not display in Profiles 2019-12-02 16:28:13 +02:00
AndreyL ProductEngine 56056aa198 Upstream merge from viewer-neko 2019-11-27 23:20:03 +02:00
AndreyL ProductEngine d0c7b4fade Merged in lindenlab/viewer-release 2019-11-27 08:19:22 +02:00
maxim_productengine 4acfc99fa6 SL-12317 UI Changes to Group limits 2019-11-22 18:26:56 +02:00
Ansariel 3bc189bda7 Merge Firestorm LGPL 2019-11-19 20:28:09 +01:00
Ansariel c11cb05879 Merge Firestorm LGPL 2019-11-13 19:35:04 +01:00
AndreyL ProductEngine f83ada32f7 Merged in lindenlab/viewer-release 2019-11-13 10:50:25 +02:00
Ansariel 229a6928e9 Merge Firestorm LGPL 2019-11-12 23:22:39 +01:00
Ansariel fd4b8a7bb1 Merge Firestorm LGPL 2019-11-12 18:45:02 +01:00
AndreyL ProductEngine 5f731d84cb Downstream merge from 494-maint-wassail 2019-11-12 02:37:15 +02:00
Kitty Barnett d58b530e80 Add text_valign to LLTextBase to specify the vertical alignment within a single document line The existing font_valign property is used as to position the entire document so it's impossible to top align a text editor with each line's text centered within that line's extents 2019-11-07 20:48:20 +01:00
Kitty Barnett b44ade68e6 FIXED Calling LLTextBase::insertStringNoUndo() with more than one segment results in overlapping segment ranges
Text is only inserted into the view model *after* the segments are added so if seg1_pos_start is the current EOF:
  -> 1st segment: getSegIterContaining(seg1_pos_start) returns the last segment and insertSegment() ends up properly adjusting its start/end position
  -> 2nd segment: getSegIterContaining(seg2_pos_start) returns mSegments.end() since its position is beyond the available and insertSegment() leaves the last 2 segments with overlapping ranges
After the fix:
  -> if index runs past the end of all segments then mSegments.end() is returned (no change)
  -> if index is a position past the length of text but claimed by a segment then that segment is returned (change)
  -> if index specifies a position in the middle of the document unclaimed by any segment then the first segment after that position is returned (no change)
     (this does break the assertion that segment->mStart <= index <= segment->mEnd?)
2019-11-07 20:33:53 +01:00
Kitty Barnett 418308bc7c Characters can have more than one representation in LLFontFreetype
* By default all viewer text will use B/W glyphs
  * Added temporary use_color attribute to LLTextBase for testing
2019-11-06 12:34:26 +01:00
Ansariel d79b79fbe2 Merge viewer-ordered-shutdown 2019-10-19 03:16:10 +02:00
Ansariel e8b426d1c2 Merge viewer-neko 2019-09-11 17:34:55 +02:00
andreykproductengine 98b28e5881 SL-11910 [Win] Horizontal scroll 2019-09-10 19:49:15 +03:00
andreykproductengine c61d0f4297 DRTVWR-493 LLUI to LLParamSingleton 2019-08-10 15:31:03 +03:00
Ansariel 69f14e2f29 Initial merge of viewer-legacy-profiles
For the time being, use the Firestorm legacy profiles. Can be switched via FSUseOwnProfiles debug setting
2019-07-19 11:21:54 +02:00
Ansariel a63693b454 Merge mesh upload changes 2019-05-11 13:12:11 +02:00
AndreyL ProductEngine 3175525950 Merged in lindenlab/viewer-release 2019-05-08 21:41:56 +03:00
AndreyL ProductEngine 93f0023efa Merged in lindenlab/viewer-release 2019-05-08 21:41:11 +03:00
andreykproductengine 9d2cb130e3 SL-11028 [Legacy Profiles] Selection in account field is malfunctioning 2019-04-25 23:03:18 +03:00
andreykproductengine 580b35c8ea SL-307 Display in-viewer all warning messages logged by the mesh uploader 2019-04-01 20:22:25 +03:00
Ansariel dd2636a2c2 Merge viewer-neko 2019-01-10 21:10:36 +01:00
AndreyL ProductEngine 09b750483a SL-10293 Firestorm PR: preferences and menu search 2019-01-03 22:59:49 +02:00
Ansariel 95fcf065c1 Merge viewer-bear 2017-04-19 21:43:58 +02:00
andreykproductengine b7c909367e MAINT-7267 Fixed UI missing last symbol of string on hi-res monitors. 2017-04-06 21:29:43 +03:00
Mnikolenko Productengine bf850c110b MAINT-7224 Chat logs move down, leaving huge empty space 2017-03-21 16:18:23 +02:00
Mnikolenko Productengine eddcb43851 MAINT-7224 Chat logs move down, leaving huge empty space 2017-03-21 16:18:23 +02:00
Ansariel dd69a22834 Merge viewer-bear 2017-01-27 09:42:51 +01:00
andreykproductengine 8ef99c38a5 MAINT-918 Newline was not displayed correctly in chat window. 2017-01-04 18:38:52 +02:00
Ansariel b658e3cce5 FIRE-20214: Text gets deselected upon avatar/group name received callback 2016-10-10 13:02:22 +02:00
Ansariel f0366fa155 Merge latest fixes from viewer-vob that didn't get into viewer-release yet 2016-09-15 23:32:34 +02:00
andreykproductengine da23e0f925 MAINT-6726 Fixed LLLineEditor menus staying in memory forever 2016-09-13 20:32:34 +03:00
andreykproductengine a195406e48 MAINT-6726 Fixed LLLineEditor menus staying in memory forever 2016-09-13 20:32:34 +03:00
andreykproductengine ff118b7d21 MAINT-6720 Fixed onVisibilityChange() crash in LLTextBase 2016-09-12 17:45:12 +03:00
andreykproductengine 50ed0db1ff MAINT-6720 Fixed onVisibilityChange() crash in LLTextBase 2016-09-12 17:45:12 +03:00
Ansariel d48538d3ab Merge viewer-lion 2016-05-24 08:42:12 +02:00
Ansariel 71f1707b99 Merge viewer-lion 2016-05-23 17:41:19 +02:00
andreykproductengine efa716b5fc MAINT-2129 "Block" button doesn't become disabled 2016-05-18 19:29:31 +03:00
andreykproductengine d37003a631 MAINT-2129 signuls cleanup 2016-05-23 18:06:16 +03:00
Ansariel a0188a5358 Merge Firestorm LGPL 2016-05-09 12:41:24 +02:00
Oz Linden 950c41d184 merge 4.0.4-release and MAINT-5974 2016-05-06 10:28:42 -04:00
Ansariel 743e0c0097 Merge Firestorm LGPL tip 2016-04-23 12:27:34 +02:00
Ansariel 9cd3d79b20 Merge Firestorm LGPL tip 2016-04-23 11:53:52 +02:00
Ansariel 33b1d5efa0 Dump FSFixCursorPosition and workaround fix for cursor position being off now there is a fix by LL and since FSFixCursorPosition has been disabled by default for over 3 years anyway 2016-04-22 17:05:24 +02:00
Ansariel d171e16c58 Merge Firestorm LGPL 2016-03-18 10:16:25 +01:00
Ansariel 08a3c121ca Build fix 2016-03-17 23:41:57 +01:00
Ansariel 1bba3dfbe4 Merge viewer-bear 2016-03-17 21:14:49 +01:00
Oz Linden 31f3db0291 merge changes for DRTVWR-417 2016-03-16 13:08:06 -04:00
andreykproductengine 230fc28d8a MAINT-6097 FIXED On required update, clicking link to release notes opens browser behind menu 2016-03-11 20:16:03 +02:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Oz Linden 5822fb00b6 merge DRTVWR-398 build cleanup fixes 2016-03-07 12:41:11 -05:00
Ansariel e7ade840e4 Merge viewer-bear 2016-01-24 14:00:30 +01:00
andreykproductengine c73d9e5c44 MAINT-5984 FIXED Incorrect cursor position with UI scale >1.0 2015-12-29 20:20:40 +02:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Ansariel 83862ed91a Merge Firestorm tip 2015-10-15 11:02:30 +02:00
Oz Linden 69ff937e47 merge changes for 3.8.5-release 2015-10-13 08:43:03 -04:00
Ansariel 5524d38dff Merge viewer-quickgraphics 2015-10-03 16:38:26 +02:00
Ansariel 5fe09cb64d Merge Viewer-Bear 2015-08-22 03:13:17 +02:00
Mnikolenko ProductEngine 4ab4c6da02 MAINT-5463 FIXED Add hovertext to the official link badge in chat/IM, etc. 2015-08-10 11:15:50 +03:00
Oz Linden 71a468c6fb merge changes for other open sourc contributions 2015-07-30 11:09:00 -04:00
Mnikolenko ProductEngine 07020ffce0 MAINT-5428 FIXED Show tooltip for both parts of url. 2015-07-29 12:35:54 +03:00
AndreyL ProductEngine e62d5ea4e8 MAINT-5019 FIXED Undesired "http://" added to domains sent in chat
Completely removed matching of the URLs w/o a protocol
+ Some unit tests
2015-07-29 07:35:08 +03:00
Oz Linden 034fb74d05 merge changes for STORM-2113 2015-04-14 05:39:36 -04:00
Oz Linden a8ef252571 merge changes for 3.7.27-release 2015-04-13 16:23:36 -04:00
Cinder 5a282abe18 STORM-2113 - uri parsing cleanup and fixes 2015-04-11 15:23:06 -06:00
Oz Linden d6f7a16a68 merge changes for 3.7.26-release 2015-03-23 22:39:18 -04:00
Nicky 006190f2a1 Merge with tools update. 2015-05-05 13:09:27 +02:00
Ansariel 6e21b3e96d Make URI query part color customizable 2015-05-04 10:34:22 +02:00
Ansariel aabeeadf77 More hammering on the URI fail:
* Don't try to parse an unescaped URI - it will fail; unescape the label after parsing
* Use the default tooltip text for the labels
* Set the tooltip for both host and query part of an URI
2015-05-04 10:17:43 +02:00
Ansariel 9be423524d Merge LL V3.7.27 2015-04-14 22:08:31 +02:00
Oz Linden 905431cf60 merge changes for 3.7.25-release 2015-02-24 15:48:28 -05:00
andreykproductengine dbafa3c358 MAINT-4975 FIXED Sender's name is hidden out of view for inventory offer popups and payment popups 2015-03-11 15:56:31 +02:00
Mnikolenko ProductEngine f097c731d6 MAINT-4169 ShowGreyQueryInUrls debug setting was removed and the grey part of the link always appears. 2015-03-04 13:10:58 +02:00
Mnikolenko ProductEngine bf51454223 MAINT-4169 FIXED grey out all but domain name in SL-links, same as it's done for non-Linden URLs 2015-01-09 12:10:32 +02:00
Jonathan Yap 2d7fb5c675 STORM-2094 Save button not activated if spelling corrected in Notecard and no other changes made 2014-12-28 09:34:28 -05:00
callum_linden 23711c9275 Rename llround(..) to ll_round(..) because of a collision with MS llround (long long round) in VS2013 2014-12-10 08:44:08 -08:00
andreykproductengine 389cba01c6 MAINT-3457 FIXED List of notecard content is shifted while resize of notecard window 2014-12-08 18:47:04 +02:00
Ansariel 24eda00b2e Merge fix #2: Fix optional icon positioning in LLTextBase
Icon needs to be prepending the text if we either want it to be on the left or
the URL itself is trusted. On the other hand, only append the icon if we either
want it to be on the right side of the URL (restoring behavior prior V3.7.25)
AND if the URL itself is not trusted (we would create a duplicate trusted icon
otherwise).
2015-02-25 10:48:05 +01:00
Tank_Master 22386b18b4 Merge LL 2.7.25 2015-02-24 21:22:32 -08:00
Ansariel 3a52b250e8 Add "Show transcript" option to regular avatar SLURL context menu to keep it in sync with the specialized LLNameListCtrl version 2015-02-16 12:45:16 +01:00
Ansariel d6befe9028 FIRE-15416: Add "block" to the avatar name context menu in chat history using V1 chat headers 2015-01-23 12:48:09 +01:00
Ansariel 48fc17d6e1 Merge LL V3.7.16 2015-01-14 17:36:30 +01:00
Ansariel 0d80b8f758 Fix crash when trying to open a script while FSFixCursorPosition is set to TRUE 2015-01-13 11:39:33 +01:00
Ansariel a45088cb6b Merge LL V3.7.11 2015-01-12 12:54:15 +01:00
Ansariel e1ce6e3d58 Merge Firestorm LGPL tip 2015-01-08 23:12:58 +01:00
Ansariel f4bfb1aadf Merge LL V3.7.9 (AIS3 + SSA) 2014-10-22 02:02:08 +02:00
maksymsproductengine 2b8827a55f MAINT-4169 FIXED Suppress initial display of the path portion of URLs from other users and scripts 2014-10-13 19:14:42 +03:00
maksymsproductengine 6ea75fd4b0 MAINT-4548 & MAINT-4557 FIXED build issues 2014-10-07 18:59:11 +03:00
maksymsproductengine a25748e11e MAINT-4119 FIXED Uniquely decorate links on Second Life or Linden Lab domains 2014-10-02 18:20:10 +03:00
maksymsproductengine dd8d2b59f7 MAINT-4170 FIXED Eliminate homoglyphs in URL hostnames: converting to lowercase links without scheme 2014-09-24 23:09:30 +03:00
maksymsproductengine 61e05f9125 MAINT-4170 Eliminate homoglyphs in URL hostnames: used 3p-uriparser; 2014-09-22 20:01:55 +03:00
andreykproductengine 7982ae6b91 MAINT-3967 FIXED Up arrow key does not move the cursor up in chat field.
Reverted previous two fixes and modified LLTextBase::changeLine()
2014-08-28 19:36:47 +03:00
Nicky b54983b605 Allow preferences to be searched. 2014-09-28 03:00:57 +02:00
andreykproductengine 208fe31200 MAINT-3967 FIXED Up arrow key does not move the cursor up in chat field.
Reverted previous two fixes and modified LLTextBase::changeLine()
2014-08-28 19:36:47 +03:00
Mnikolenko ProductEngine ae15e85e9f MAINT-3460 FIXED Dictionary doesn't exchange the mispelled word to correct one in a special case 2014-07-08 13:07:46 +03:00
simon bfa42c9e28 Merge downstream code and become 3.7.12 2014-07-07 16:17:53 -07:00
Cinder 8d2e0fb3a0 STORM-2035 - Invert the background color in script editors for highlighting sections. Since the background color can be changed by the user, this ensures distinctive highlighting 2014-06-20 13:43:31 -06:00
maksymsproductengine 7991fe96ec MAINT-3475 FIXED 'windows 64bit (?) crash in LLTextBase::getDocIndexFromLocalCoord' 2014-06-20 20:26:51 +03:00
simon d760a6889d Merge downstream code 2014-06-18 19:02:25 -07:00
Oz Linden e15002a11c merge changes for 3.7.9-release 2014-06-16 11:42:37 -04:00
maxim@mnikolenko 72dba8742c MAINT-4070 FIXED Use icon in urls when content is trusted. 2014-05-28 13:20:12 +03:00
maksymsproductengine 8b86130f25 MAINT-3967 FIXED Up arrow key does not move the cursor up in chat field. 2014-05-07 18:42:24 +03:00
Oz Linden a98b4b6bee merge changes for 3.7.7-release 2014-05-07 11:09:04 -04:00
Stinson Linden 001621dfc2 MAINT-4009: Patching a small memory leak for when menu items were being created before the viewer window initialization had created the menu holder. Also, added llasserts in other cases when referencing the menu holder to ensure the holder is non-null. 2014-05-05 23:24:34 +01:00
Cinder 8c39617c9a Begin moving script editor portions of LLTextEditor to their own derived class.
This should fix the run off segment bugs by not overriding LLTextBase::clearSegments() in LLTextEditor
TODO: Move the rest of the script stuff out of LLTextEditor for simplicity sake
2014-04-18 12:52:07 -06:00
Ansariel 6845d6ac31 FIRE-11045: Spell checking changes on an unmodified notecard are not identified as such 2014-09-02 13:51:42 +02:00
Ansariel f166eed059 Update Search & Replace floater to latest version from Kitty Barnett (Catznip viewer) 2014-09-02 12:17:52 +02:00
Oz Linden bd4f4ee793 logging cleanup in support of debugging text editor problems 2014-03-19 14:17:13 -04:00
Oz Linden d6fdc6e68f merge changes for 3.7.3-release 2014-03-14 16:38:12 -04:00
Oz Linden 3ee3d4a8f4 correct logging levels (ERR causes a crash), and a minor style fix 2014-03-14 16:19:21 -04:00
Richard Linden 5b846ed2a6 merge with release 2014-03-12 12:48:43 -07:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -07:00
Tank_Master 3d1ac7c0ec Merge LL 3.7.3 (Viewer-Bear fixes) 2014-03-17 14:14:15 -07:00
Ansariel a48312b602 I shouldn't do this at night... 2014-10-29 02:26:00 +01:00
Ansariel fd4ede15ca Properly free signals in LLTextBase 2014-10-29 02:19:35 +01:00
simon cfadbe631f Revert earlier back-out for MAINT-535 ... it's back in 2014-01-10 13:15:19 -08:00
simon f291995dac Revert changes made for MAINT-535 to test in a release cohort. 2014-01-07 15:18:29 -08:00
Richard Linden 17e9c872ad Automated merge with http://bitbucket.org/lindenlab/viewer-release 2013-11-11 19:17:49 -08:00
Richard Linden 697d2e720b renamed TimeBlock to BlockTimerStatHandle 2013-10-15 20:24:42 -07:00
Richard Linden 80dfbbaacd merge from viewer-release 2013-10-08 11:59:24 -07:00
Richard Linden 17df8988fe renamed TraceType to StatType
added more MemTrackable types
optimized memory usage of LLTrace some more
2013-10-07 13:38:03 -07:00
Richard Linden 12f0f8cb72 changed over to manual naming of MemTrackable stats
changed claimMem and disclaimMem behavior to not pass through argument
added more mem tracking stats to floater_stats
2013-10-01 13:46:43 -07:00
Richard Linden 053d97db1b better memory usage for LLTrace (tighter packing of recording arrays)
removed complicated and unnecessary fast timer gapless handoff logic (it should be gapless anyway)
improved MemTrackable API, better separation of shadow and footprint
added memory usage stats to floater_stats.xml
2013-09-25 19:12:35 -07:00
Richard Linden 52da9f5f49 merge with viewer-release 2013-09-09 18:58:41 -07:00
Richard Linden cbe397ad13 changed fast timer over to using macro
another attempt to move mem stat into base class
2013-09-05 14:04:13 -07:00
simon 27d637d0f1 Merge downstream code from CHUIStorm release 2013-08-26 14:43:23 -07:00
Nicky e7bc0e6e63 BUG-3605 / CHUIBUG-197 Don't create excessive amounts of string objects in LLNormalTextSegment::getNumChars. 2013-08-14 01:00:41 +02:00
MaximB ProductEngine 3e934d5089 MAINT-3151 (Issue with urls being autoclicked when holding left click into an unfocused textbox then dragging pointer over a url and releasing.) 2013-09-23 09:14:53 +03:00
Mnikolenko ProductEngine 28339afa15 MAINT-535 'trust model' is added for secondlife:// URLs in wiki style links. Chat history is marked as untrusted source now. 2013-10-22 12:47:16 +03:00
Kitty Barnett 1ba7d93a6a [BUG-3527] Replacing a misspelling surrounded by line break segments results in only line breaks being inserted 2013-08-12 19:34:42 +02:00
Ansariel 8e3e639388 Add request teleport option to V2 chat header context menu & avatar SLURL context menu 2014-01-29 20:23:41 +01:00
Cinders 68235b2b03 Include Add to Contact Set in menu_url_agent.xml 2013-12-26 17:33:03 -07:00
Tank_Master 3603c4f992 Merge ll 3.6.11 2013-11-23 20:22:24 -08:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Richard Linden 8208a40412 BUILDFIX: reverted changes that attempted to automate mem track
stat definition as they don't work on gcc/clang
2013-07-01 18:50:51 -07:00
Richard Linden 04bdc8ba83 SH-4294 FIX Interesting: Statistics Texture cache hit rate is always 0%
also, removed LLTrace::init and cleanup
removed derived class implementation of memory stat for LLMemTrackable
is automatic now
2013-07-01 17:04:01 -07:00
mberezhnoy 2b8beeeff1 CHUI-809 (Right-click menu on user name in compat chat mode doesn't have "IM")
Fixed "Add friend" option always being greyed out, add ability to block object via context menu in compact chat mode.
2013-06-20 12:45:22 +03:00
mberezhnoy 882ab04ef3 CHUI-809 (Right-click menu on user name in compat chat mode doesn't have "IM")
Added callback for friendship checking
2013-06-13 20:21:24 +03:00
Richard Linden 0a96b47663 merge with viewer-release 2013-06-05 19:05:43 -07:00
PavelK ProductEngine 0ada8944ee CHUI-964 ADD FIX Oversized "To" input field hides actual IM text 2013-06-05 19:40:06 +03:00
Mnikolenko ProductEngine 3bbab5bb46 CHUI-957 FIXED Missing line was added. 2013-06-04 14:45:19 +03:00
Merov Linden 0b4b92cbbf Pull merge from lindenlab/viewer-release 2013-05-30 14:07:59 -07:00
simon 507ce0d84f Merge downstream code 2013-05-29 14:42:19 -07:00
Merov Linden 2113bb8159 Pull merge from viewer-release 2013-05-22 11:23:51 -07:00
Gilbert Gonzales 892f3cdd2c CHUI-967: fix display of % escapes in chat 2013-05-22 06:26:54 -04:00
Richard Linden 41b4374760 SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
renamed LLView::handleVisibilityChange to onVisibilityChange to reflect
standard naming conventions for handlers vs. reactors
2013-05-10 17:57:12 -07:00
simon ee2fce8790 Merge downstream code and viewer-beta 2013-05-09 14:10:45 -07:00
Merov Linden 043f2e0bfd Pull from viewer-release 2013-05-02 14:09:40 -07:00
Merov Linden 5cf1c9bfe1 CHUI-845 : Make changeLine() a bit more resistant to unforseen line count values (i.e. 0) and a bit more general 2013-04-24 17:26:09 -07:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00