Commit Graph

10039 Commits (b26d3f37bef4e10be2b5f7f4f6408485ed3ccae7)

Author SHA1 Message Date
Leyla Farazha b26d3f37be fixed merge problem 2010-05-25 15:07:23 -07:00
Leyla Farazha 16e3d7ebf5 Merge 2010-05-25 14:22:56 -07:00
Leyla Farazha 1bd6061ff5 reverting debug state for sell land button 2010-05-25 14:21:10 -07:00
Leyla Farazha 7fb9410422 LLFloaterAvatarPicker now uses LLAvatarNames
reviewed by James
2010-05-25 14:15:26 -07:00
Leyla Farazha 216c7d3e9a Mappable Buddies now using new LLAvatarNames
reviewed by James
2010-05-25 14:14:08 -07:00
Leyla Farazha 94945f996a Report abuse floater updated for display names compatibility
reviewed by James
2010-05-25 14:13:26 -07:00
Leyla Farazha 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
James Cook a91d10dc18 Merge 2010-05-25 11:41:33 -07:00
James Cook 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
James Cook fb51f985c3 DEV-50013 Avatar icons use username for tooltip
Reviewed with Leyla.
2010-05-25 11:39:25 -07:00
James Cook 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
Richard Nelson f682c996d2 DEV-50271 FIX SLURL support for non-clickable display names 2010-05-24 18:29:29 -07:00
Richard Nelson 4ea7d2de9f DEV-50271 FIX SLURL support for non-clickable display names
reviewed by James
2010-05-24 17:25:35 -07:00
James Cook 934dc6e2d0 DEV-50013 Inventory offer notifications use new name system
Reviewed with Richard
2010-05-24 16:59:05 -07:00
James Cook 3b0bb81596 DEV-50013 Add "Reset" button to Set Name dialog
Reviewed with Richard
2010-05-24 16:58:49 -07:00
Richard Nelson 2920d4c46f merge 2010-05-24 16:37:52 -07:00
Richard Nelson a146a0f27b merge 2010-05-24 16:31:26 -07:00
Richard Nelson 7e487652e3 DEV-50271 WIP SLURL support for non-clickable names
fixed merging logic for blockvalues like rect, uiimage, etc
2010-05-24 16:30:55 -07:00
James Cook 01fa137993 DEV-50013 Use new cache to get legacy name for Vivox 2010-05-24 15:36:30 -07:00
Nyx (Neal Orman) 7100d1ce00 Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public 2010-05-24 17:19:06 -04:00
Nyx (Neal Orman) 40c672a61f AVP-92 FIX Avatar appears to be fat when opening the shape editor
Wearable editor previews were affecting the in-world avatar and not properly
resetting the changed parameters. Since the "body fat" slider is the last in
the default tab for the shape editor, this leaves your avatar fat.

Reconfigured the code to work through the wearables and most importantly
included a call to updateVisualParameters() at the end of the render function.

This appears to have fixed the issue - your avatar does not appear affected during
the avatar preview generation anymore.


Code reviewed by Seraph
2010-05-24 17:16:03 -04:00
Xiaohong Bao a98454059c Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public 2010-05-24 14:42:53 -06:00
Xiaohong Bao e2f6ec6294 EXT-7467: FIXED: [DUPLICATED XUI ID] panel_preferences_graphics1.xml has duplicated string id. 2010-05-24 14:41:24 -06:00
Loren Shih 5ab2127fe3 automated merge 2010-05-24 16:40:21 -04:00
Loren Shih 358d23a3a0 EXT-7463 FIXED Create instrumentation for tracking COF actions on login
Added more llinfos for tracking COF and InventoryModel changes.
2010-05-24 16:39:34 -04:00
Nyx (Neal Orman) 7be50ad3a5 AVP-60 EXT-7366 EXT-7209 WIP Camera views not correct when editing wearable
Added code to shift camera focus to appropriate section of the avatar when
wearable editor accordion tabs are expanded / collapsed.

Known issue: camera does not shift properly when first opening wearable editor.
Will implement a selectDefaultSubpart() function later.

Code reviewed by Prep
2010-05-24 16:16:28 -04:00
Richard Nelson 087ba60672 DEV-50271 WIP SLURL support for non-clickable names
fixed merging logic for blockvalues like rect, uiimage, etc
2010-05-24 12:25:21 -07:00
Nyx (Neal Orman) 0c55c8a0b8 Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public 2010-05-24 15:06:40 -04:00
Nyx (Neal Orman) 53b6156379 AVP-91 FIX avatars rebaking on every login
Whitespace change as my last checkin was reviewed and tested to pass.
Avatar baked texture hashing now works across logins and uses the correct
texture indices.

Code reviewed by Vir
2010-05-24 15:06:24 -04:00
Eli Linden 5f24661778 Merge 2010-05-24 11:20:06 -07:00
Eli Linden f813793fac ND-46735 WIP IT JA linguistic 2010-05-24 11:19:34 -07:00
Nyx (Neal Orman) 536712a041 EXT-7436 FIX pt 2 - added extra check for wearable to prevent log spam
Reviewed by Seraph
2010-05-24 14:18:04 -04:00
Nyx (Neal Orman) 16134b2baa Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public 2010-05-24 13:49:04 -04:00
Nyx (Neal Orman) 8025997c89 AVP-91 WIP Fix baked texture hashing
First pass at fixing baked texture hashing - unified the hash code to one
function, made sure all messages pass correct texture indices.

Initial code review by Vir
2010-05-24 13:48:52 -04:00
Nyx (Neal Orman) a2c3df025c Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public 2010-05-24 13:12:39 -04:00
Nyx (Neal Orman) 4ef12d1ecf EXT-7436 FIX every other login ruthing.
I think this is related - every time you wear one body part or a single piece
of clothing, it would remove all body parts, causing you to regenerate defaults
which makes you look like ruth. Simple error in logic, body parts should only
be replaced if they are being removed.

Code reviewed by Seraph
2010-05-24 13:12:28 -04:00
Loren Shih 583060bc63 automated merge 2010-05-24 12:55:22 -04:00
Loren Shih b92c1b6d74 EXT-7463 FIXED Create instrumentation for tracking COF actions on login
Added a bunch of llinfos to track various COF link item actions.
2010-05-24 12:52:50 -04:00
Aimee Linden bd53640901 EXT-7460 FIXED (VWR-19451) Viewer crashes when opening notifications console.
EXT-6783 replaced the "History" notifications channel with "Persistent" but llfloaternotificationsconsole.cpp still refers to "History".
2010-05-24 11:19:31 +01:00
Tofu Linden 5e5a895b76 merge from PE's viewer-trunk 2010-05-24 08:05:30 +01:00
Tofu Linden 08480629e9 merge backout 2010-05-24 07:49:36 +01:00
Tofu Linden 87d0c6d583 Backed out changeset 57e00f7d4d4f
(was: EXT-7145: FIXED: make viewer to handle "URL redirect " for http texture.)

This was causing osx/linux build failure.
2010-05-24 07:49:26 +01:00
Xiaohong Bao 28d4fe68f8 Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public 2010-05-21 18:12:38 -06:00
James Cook d674d11f89 Rename LLAvatarName::getNameAndSLID() to getCompleteName()
Discussed with Leyla/Richard
2010-05-21 17:11:31 -07:00
Xiaohong Bao 81e6f6131b EXT-7394: FIXED: Trees have more polys at low detail than at high detail. 2010-05-21 18:04:32 -06:00
James Cook 8992232e64 DEV-50013 Display names in mini-map tooltips
Reviewed with Leyla
2010-05-21 16:45:35 -07:00
Monroe Linden 79f697ad51 Fix for EXT-5667 (support window.open() in shared media so google docs will work).
Moved the processing of clicks on _external and _blank targeted links from LLMediaCtrl to LLViewerMediaImpl.

Removed LLMediaCtrl::setOpenInExternalBrowser() since that functionality is available through the use of the _external target attribute in web content.

Removed LLMediaCtrl:: setOpenInInternalBrowser() since it was unimplemented and not used.

Made the webkit media plugin set llqtwebkit's window open behavior to WOB_SIMULATE_BLANK_HREF_CLICK.  This is #ifdefed out on Linux until we get a new Linux build of llqtwebkit.
2010-05-21 15:36:12 -07:00
Callum Prentice 9add3aa8cb Fixed Windows line endings that crept in 2010-05-21 15:27:27 -07:00
James Cook 22cef83f9a DEV-49489 Money transaction msgs use display names
Server 1.40 will be deployed before Viewer 2.1, and it sends more
extensive money transaction messages, so I removed all the old
crufty localization code.  If Viewer 2.1 connects to an older
server (like a dev grid) money transaction messages will be
English only.  This simplifies the code tremendously.
Reviewed with Leyla
2010-05-21 15:26:18 -07:00
Callum Prentice ba9c64d2bb Merge 2010-05-21 15:23:36 -07:00