905431cf60
merge changes for 3.7.25-release
2015-02-24 15:48:28 -05:00
6f3cf79a3a
merge changes for 3.7.24-release
2015-01-13 13:46:45 -05:00
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
6ea75fd4b0
MAINT-4548 & MAINT-4557 FIXED build issues
2014-10-07 18:59:11 +03:00
a25748e11e
MAINT-4119 FIXED Uniquely decorate links on Second Life or Linden Lab domains
2014-10-02 18:20:10 +03:00
25547d320a
MAINT-4210 FIXED Don't try to replace wiki-link with label if it's not correct(contains url in label part).
2014-08-26 12:02:22 +03:00
5b846ed2a6
merge with release
2014-03-12 12:48:43 -07:00
cfadbe631f
Revert earlier back-out for MAINT-535 ... it's back in
2014-01-10 13:15:19 -08:00
f291995dac
Revert changes made for MAINT-535 to test in a release cohort.
2014-01-07 15:18:29 -08:00
52da9f5f49
merge with viewer-release
2013-09-09 18:58:41 -07:00
ea14f690e2
MAINT-535 Wiki-style link markup hides potentially malicious secondlife: app URLs
...
Partial fix: disabled URLs in the 'label' part of Wiki-style link
2013-10-10 12:00:10 +03:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
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
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
c2d332a89c
CHUI-580 : WIP : Added disconnect of callbacks once they're called to prevent filling up the callback queue
2012-12-17 20:16:33 -08:00
3d137bae5c
Merge with viewer-chui
2012-12-17 19:29:35 -08:00
6fe7144104
CHUI-580 : WIP : Protect callback connections passed to LLAvatarNameCache::get() where necessary
2012-12-17 18:59:01 -08:00
9b556fb3fe
CHUI-599 : Use the account name in all places that are not UI related but use avatar names to index, search and other code only uses.
2012-12-14 14:19:17 -08:00
3a49beed0e
CHUI-580 : WIP : Change the display name cache system, deprecating the old protocol and using the cap (People API) whenever available. Still has occurence of Resident as last name to clean up.
2012-12-05 20:25:46 -08:00
ba129fff47
STORM-632 ADDITIONAL_FIX Use non-greedy regexp match to enable multiple <nolink>...</nolink> clauses in a single textbox.
2011-08-12 16:32:47 +03:00
f695f8d112
STORM-632 ADDITIONAL_FIX Disallow showing URL-like avatar display names as Web links in the ShareItemsConfirmation notification.
...
Updating the <nolink> tag parsing regexp to enable multiple <nolink>...</nolink> clauses in a single textbox.
2011-08-08 23:46:23 +03:00
c6895302ed
STORM-797 : pull in viewer-development
2011-01-12 11:12:56 -08:00
dda4150e01
STORM-393 FIXED Changed group SLURL color to be the same as in other URLs.
...
By the way, removed "AgentLinkColor" color which has been used since STORM-579 was fixed.
2011-01-06 15:51:38 +02:00
376ee7a3f9
STORM-797 FIXED Added parcel SLURL rendering with human readable parcel names.
...
- Added parcel info observer to LLUrlEntryParcel.
- Added notifying LLUrlEntryParcel by LLRemoteParcelInfoProcessor when parcel data arrives.
- Added notifying LLUrlEntryParcel about user login, changing host and viewer connection state to use this data in remote parcel requests.
2010-12-30 18:18:33 +02:00
abda07fb77
STORM-796 FIXED Implemented rendering /app/region/ SLapps into human-readable strings.
...
Example: secondlife:///app/region/Ahern/10/20/30/ is displayed as "Ahern (10,20,30)".
2010-12-16 20:22:32 +02:00
ca2141ce90
merge with viewer-dev
2010-12-08 16:04:07 -08:00
7ed0938226
STORM-579 FIXED SLURLs color for residents and objects names in plain text chat match the user setting for "URLs" in the Color tab in Prefs.
...
Avatar names SLURLs now use the user color setting for "URLs" everywhere across the viewer.
2010-12-03 20:45:53 +02:00
d276950c8d
build fixes
2010-11-15 17:03:52 -08:00
50d21a75a7
merge
2010-11-15 15:52:54 -08:00
b657516f72
pull beta changes back to development
2010-11-08 16:47:46 -05:00
bc7b6411d9
SEC-784
2010-11-05 18:39:26 -04:00
f3d4643b59
STORM-489 FIXED <nolink>'ed text rendered as URL
...
Changes:
* Suppressed URLs in object (sender) names of nearby chat messages loaded from history.
* Fixed text between <nolink>...</nolink> text being rendered as URL
(hand cursor on hover, context menu, context menu, opening Places SP on click).
2010-10-28 23:03:09 +03:00
07353619d0
STORM-297 FIXED Fixed "<nolink>" text appearing in confirmation message if there is "<" symbol in Landmarks name.
...
Modified the "<nolink>...</nolink>" clause parsing regexp to allow "<" in the middle.
2010-10-22 19:39:38 +03:00
f5b3fc596d
Add support for debug setting to disable link highlight & follow in URLs that appear in XUI widgets
2010-10-06 15:34:32 -07:00
ffae589843
Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
2010-09-03 17:41:39 +01:00
0a74d15935
Merge between james/viewer-identity-evolution and dessie/viewer-public
2010-09-03 15:30:16 +01:00
e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
98cc236503
Backed out changeset a62bf7c0af21
...
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
55c887225f
EXT-8010 ADDITIONAL FIX Fixed problems with avatar links underlining.
...
There were two problems:
1. Underlining broke when avatar's first and second name were on different lines.
2. There was no underline on hover for avatar miniinspector links in plaintext IM.
- First problem was caused by calling LLOnHoverChangeableTextSegment::draw() for the same segment twice- for first and second name that were
on different lines, while handleHover() was called only once. So handleHover() was called -> text was underlined -> first part of segment was
drawn underlined -> its draw set style back to normal -> second part of segment was drawn without underlining.
Fixed this by setting style back to normal only when drawing the last part of the segment.
- Second problem was caused by unusual way of appending link to text in chat history.
Changed it so that LLTextBase::appendText() now receives link not inside style params, but directly.
Also added "/inspect" ending to check in LLUrlEntryAgent::underlineOnHoverOnly().
Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/833/
--HG--
branch : product-engine
2010-08-09 15:14:45 +03:00
4919f0b341
EXT-8010 FIXED Implemented special behaviour of avatar links.
...
Avatar links are now underlined only on hover. Also they have the same color as other links.
- Underlining text and getting it back to normal are done in handleHover() and draw() of new LLOnHoverChangeableTextSegment
class derived from LLNormalTextSegment. This class has two pointers to styles- one for style which will be used for text
on hover, and another otherwise. This special type of text segment is used if link's boolean member mUnderlineOnHoverOnly
is true. So it is URL's flag depending on which textbase adds new text segment(like it currently happens with mDisabledLink).
- Changed avatar link color in colors.xml to emphasis (because it was white before and was inconsistent with other links).
Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/749/
--HG--
branch : product-engine
2010-07-26 18:10:29 +03:00
33d1aa30ab
Merge from dessie/viewer-release
2010-07-06 17:51:07 -07:00
0cf9168895
EXT-5692 FIX Add callback to create widget segment with LLAvatarIconCtrl (or LLGroupIconCtrl) based on url match id.
...
reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/610/
--HG--
branch : product-engine
2010-07-02 15:23:05 +03:00
0f86f811c2
DEV-50271 FIX SLURL support for non-clickable display names
...
std::multimap::find does *not* return an iterator just to the matching results, use std::multimap::equal_range instead
2010-05-26 14:47:48 -07:00
7435ff08b5
DEV-50271 FIX SLURL support for non-clickable display names
...
separate mIsLink from mLink to support non-clickable urls (e.g. secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/completename)
2010-05-26 13:14:47 -07:00
d539145367
DEV-50271 FIX SLURL support for non-clickable display names
...
revived mDisabledLink to make url replacement logic work again
2010-05-25 18:52:24 -07:00
a91d10dc18
Merge
2010-05-25 11:41:33 -07:00
77e6fcd423
DEV-50013 WIP gCacheName->getGroup() to distinguish from av lookups
...
Helps with global finds looking for remaining calls to patch.
Reviewed with Leyla.
2010-05-25 11:39:06 -07:00
f682c996d2
DEV-50271 FIX SLURL support for non-clickable display names
2010-05-24 18:29:29 -07:00
Oz Linden