39bf9a6eec
changed you paid... message to use non-linked name url
2010-05-26 17:38:04 -07: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
f87f436fda
merge
2010-05-26 13:15:49 -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
b921d251b8
DEV-50466 Fix spurious warnings when someone pays you
2010-05-26 12:02:29 -07:00
b6a0211a7e
DEV-50013 Inventory item creator/owner not clickable, layout fix
2010-05-26 11:51:48 -07:00
0ebdba45f6
Merge with dessie/viewer-public to get Callum's webkit changes
2010-05-26 10:53:59 -07:00
dd672e6dfb
Merge
2010-05-26 10:49:23 -07:00
fd26a33ff2
Added Debug > XUI > Flush Names Caches for testing
2010-05-26 10:48:56 -07:00
cbf5396ea7
DEV-50013 Inventory item properties in sidetray uses completename
2010-05-26 10:48:42 -07:00
703cd60800
Clean up llurlmatch test headers
2010-05-26 10:48:23 -07:00
74279f551b
merge
2010-05-26 10:11:14 -07:00
a01de4d25f
EXT-7058 FIX Viewer freezes if IM chat floater with teleport offer is resized a few times
2010-05-26 10:10:20 -07:00
779e199c29
Fix mac build for llurlentry_test.cpp
2010-05-26 09:30:31 -07:00
640e3a2e98
Fix broken Mac build on llurlmatch_test.cpp
2010-05-26 09:24:06 -07:00
14418c1970
Merge from default branch, resolving conflict in indra/newview/llinventorybridge.cpp
...
LLObjectBridge::openItem() was concurrency modified.
Applied behavior that was changed in c3220f7f7699 according to
VWR-13743 FIXED Change Request: Change double click action for inventory wearables
DEV-33391 FIXED Change Request: Change double click action for inventory wearables
--HG--
branch : product-engine
2010-05-26 10:24:05 +03: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
6885a1a6ad
merge
2010-05-25 16:51:24 -07:00
a2600644ab
DEV-50015 FIX Implement changes to the Buy L$ button in the top bar of the viewer
2010-05-25 16:51:06 -07:00
c89af9db54
EXT-7487 - Bumping down class of 7000 series nvidia cards.
2010-05-25 16:18:36 -07:00
d7911eda9c
Merge
2010-05-25 16:07:15 -07:00
4bd0291dff
Merge
2010-05-25 16:06:40 -07:00
879f0cd5fd
Updated install.xml to point to a version of temporary version LLQtWebKit that skips past SSL/Cert errors so QuickBuy functions can be tested. (Windows only)
...
Also tweaked the QuickBuy Currency floater so scrollbars do not appear for current Web content
2010-05-25 16:06:01 -07:00
d8f2e1d820
Merge
2010-05-25 15:45:45 -07:00
cef5b2c5a4
automated merge
2010-05-25 18:15:22 -04:00
1cc24544d4
Fixed compile error in mistakenly-checked-in llvoavatarself.h
2010-05-25 18:13:46 -04:00
659163c15c
Fix build
2010-05-25 15:10:42 -07:00
a70d9363da
Merge
2010-05-25 15:07:39 -07:00
b26d3f37be
fixed merge problem
2010-05-25 15:07:23 -07:00
687b490721
merge
2010-05-25 14:52:25 -07:00
b2274765da
DEV-50013 Group chat moderator tooltip shows username
2010-05-25 14:48:55 -07:00
b0bdde3ee3
merge
2010-05-25 14:48:09 -07:00
208d935e8f
Merge
2010-05-25 14:33:30 -07:00
16d337307e
EXT-7289 FIX en_xui_change
2010-05-25 14:32:09 -07:00
16e3d7ebf5
Merge
2010-05-25 14:22:56 -07:00
1bd6061ff5
reverting debug state for sell land button
2010-05-25 14:21:10 -07:00
7fb9410422
LLFloaterAvatarPicker now uses LLAvatarNames
...
reviewed by James
2010-05-25 14:15:26 -07:00
216c7d3e9a
Mappable Buddies now using new LLAvatarNames
...
reviewed by James
2010-05-25 14:14:08 -07:00
94945f996a
Report abuse floater updated for display names compatibility
...
reviewed by James
2010-05-25 14:13:26 -07:00
5769670cd1
DEV-50291 Text on Buy Land floater cut off when Display Name user name combination is long
2010-05-25 14:12:46 -07:00
1b56e79624
automated merge
2010-05-25 16:06:34 -04:00
35fb83e1e3
EXT-7463 FIXED Create instrumentation for tracking COF actions on login
...
Removed llinfos that was causing excessive spam.
2010-05-25 16:05:17 -04:00
00d534d7a7
EXT-7480 Add debuga bility to set texture discard levels
...
Added TextureDiscardLevel override for specifying texture discard levels.
Aesthetic change to add debug- flag to all avatar debug reporting metrics.
2010-05-25 14:56:45 -04:00
a91d10dc18
Merge
2010-05-25 11:41:33 -07:00
d6ea429845
DEV-50013 Display names load at startup in local chat/IM history
...
Had to change the chat log file format to include agent_id.
Code will load viewer 2.0 logs, but viewer 2.0 will just discard
data from 2.1 logs, which seems OK. Reviewed with Leyla.
2010-05-25 11:40:29 -07:00
fb51f985c3
DEV-50013 Avatar icons use username for tooltip
...
Reviewed with Leyla.
2010-05-25 11:39:25 -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
8da5677f8a
ND-46735 WIP IT JA linguistic
2010-05-25 11:17:21 -07:00
f6b4cd3b32
fix for llinitparam logic (using wrong scope for static method)
2010-05-25 10:23:21 -07:00
1040c7039b
merge
2010-05-25 10:15:09 -07:00
Richard Nelson