60db8577a9
Merge
2010-09-16 12:02:24 -07:00
bc80e6c7f3
simplifying the inspector tooltip logic
2010-09-08 16:39:58 -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
34a063ae5a
VWR-20715 Double-click teleport
...
SNOW-352/SNOW-421/SNOW-462 Imported from Snowglobe 2
By Twisted Laws and Thickbrick Sleaford
2010-08-26 16:49:41 +01:00
54b9992eae
remove parens from mini-inspector if not using display names
2010-08-24 15:12:56 -07: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
5fab3253f9
Merge from dessie/viewer-release
2010-08-20 14:48:00 -07:00
eaf2359782
fixed line endings
2010-08-19 14:27:23 -07:00
c39d74ac98
synchronous llavatarcachename::get calls now return true even if entry is expired
2010-08-19 14:23:14 -07:00
3a5ef5bd6f
fixed nametag reverting to legacy name ever 3 minutes
2010-08-13 17:33:25 -07:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
22f65ad046
merge from viewer-release
2010-08-07 12:43:55 +01:00
bcd8443371
Fixes for EXT-8563 "VWR-20156: Prim Media on HUDs has no Audio or Interactivity"
...
Backed out changeset 1b65d0d42c67 (the fix for EXT-5205), and replaced it with a check in LLPanelPrimMediaControls::nextZoomLevel().
Made LLViewerMediaImpl::calculateInterest() not attempt to calculate distances to HUD attachments, since their global positions are invalid.
2010-08-06 20:06:16 -07:00
566e3969f9
deprecated LLPanel::child*() methods
2010-07-30 10:02:30 -07:00
d603085c03
Merge with dessie/viewer-release
2010-07-19 17:22:12 -07:00
9ba22cee0e
EXT-8296 FIXED Format currency properly in tooltips and the about land window.
2010-07-09 02:49:10 +01:00
7666922593
Clean up some comments
2010-06-01 06:57:51 -07:00
f4148502e4
Rename mSLID to mUsername to match the name of the field in the UI
...
Product made a late-breaking request to change the name of this
field. The wire protocol for People API has not yet changed.
2010-05-18 16:00:45 -07:00
2b7153c26a
merge from dessie/viewer-public right before SLE code landed
2010-05-11 16:11:09 -07:00
748de83a63
EXT-5205 MoAP auto zoom should not work on prims attached as HUDs
...
Reviewed by Richard CC#192
2010-04-16 14:17:15 -07:00
a0ad3ea4fa
EXT-6503 Setting a "click to" action in the Build tool breaks Shared Media interaction
...
reviewed by richard cc#182
2010-04-08 16:03:37 -07:00
ecc2c72650
Merge latest viewer-hotfix, approximately equal to Viewer 2.0 final
2010-03-29 16:55:22 -07:00
b6e7850c0a
Merge
2010-03-29 12:30:09 -04:00
58d76a9ecf
EXT-6536 : Make LLVOAvatarSelf a singleton
...
Superficial cleanup to replace all instances of "gAgentAvatar" with "gAgentAvatarp".
2010-03-29 12:11:51 -04:00
94e6e10739
EXT-6536 : Make LLVOAvatarSelf a singleton
...
Superficial cleanup to replace all instances of "LLVOAvatarSelf *avatarp = gAgent.getAvatarObject" with "gAgentAvatar".
2010-03-29 12:00:26 -04:00
8ab9ea934f
EXT-EXT-6317 - cursor does not indicate clicking will trigger an action when over transparent objects
...
reviewed by Leyla
2010-03-26 16:57:56 -07:00
46fe5d49ca
EXT-6536 : Make LLVOAvatarSelf a singleton
...
Superficial cleanup so that all instances of gAgent.getAvatarObject() use "LLVOAvatarSelf *avatarp = gAgent.getAvatarObject".
2010-03-26 14:33:48 -04:00
0a56031bd3
automated merge
2010-03-25 20:15:51 -04:00
fc49539b36
EXT-2959 : Full out camera functions from llagent to llagentcamera
...
First check-in; only compiles, nothing more.
2010-03-23 15:59:52 -04:00
f8caa38265
merge
2010-03-16 10:34:26 -07:00
032762fecf
EXT-2418 add price to object tooltip
2010-03-09 10:04:36 +08:00
1788f26b4c
EXT-2418 Object hover tips no longer show price, description or owner
2010-03-08 16:17:47 +08:00
dcf279d663
EXT-2418 added open/sit/buy mouse cursors
2010-03-05 18:34:36 -08:00
fe8d015851
Merge
2010-03-02 14:06:23 -08:00
ee81adb01b
Preference to set what fields name tags display, and
...
first attempt at "use display names" menu item which
doesn't work yet
2010-02-18 18:46:41 -08:00
4bb57fde32
CID-39
...
Checker: DEADCODE
Function: LLToolPie::handleMediaClick(const LLPickInfo &)
File: /indra/newview/lltoolpie.cpp
simply some redundant checking, cleared-up for clarity
2010-02-15 17:56:33 +00:00
c2373fb5a6
Created stub LLAvatarNameCache for display name lookup, as
...
well as LLAvatarName base data object.
Reviewed with Kelly.
2010-02-11 16:39:15 -08:00
9dd7924b19
Merge
2010-02-11 10:09:23 -08:00
8d3d389fc7
CID-73
...
Checker: FORWARD_NULL
Function: LLToolPie::pickRightMouseDownCallback()
File: /indra/newview/lltoolpie.cpp
2010-02-11 12:52:22 +00:00
42176145c9
Converted names build from avatar object LLNameValue pairs to SLID
...
Added temporary getDisplayName() to LLCacheName
Moved temporary placeholder display names into LLCacheName
Eliminated rarely used LLAgentUI::buildName in favor of buildFullName
Standardized buildFullName capitalization
2010-02-08 14:55:30 -08:00
683e7dc9c3
FIX EXT-4630 EXT-4670: Show inspector tooltip over media, don't show it if media is playing
...
Review #91
This is a different take from my prior implementation. This has two changes to the "rules" for showing the inspector tooltip:
1. Do not show the inspector tooltip if hovering over a face that has media displaying
2. If you hover over a face with media *data* on it, show the inspector tooltip, subject to rule #1 (i.e. only if media is not displaying)
2010-01-28 12:47:45 -08:00
f714e527c5
CID-415
...
Checker: DEADCODE
Function: LLToolPie::handleTooltipObject(LLViewerObject *, std::basic_string<char, std::char_traits<char>, std::allocator<char>>, std::basic_string<char, std::char_traits<char>, std::allocator<char>>)
File: /indra/newview/lltoolpie.cpp
2010-01-27 11:57:55 -08:00
f942ede38b
Remove code that enables tooltip inspector hover over media object
...
(note: reverts changeset b6b3a58fdb30)
2010-01-22 18:12:33 -08:00
dc47f52e9f
merge
2010-01-21 18:40:37 -08:00
cdae00e7f0
better fix of EXT-299 "Mute" still showing in avatar Context menu, although label says "Block"
...
The original fix at r6543 created a duplicate node, which breaks localization. Renaming that new node with a unique name=.
2010-01-19 16:01:49 -08:00
9c0ce03d82
EXT-1341 Inspectors - Break LLToolPie::handleTooltip into smaller functions, handleTooltipLand vs. handleTooltipObject
2010-01-19 18:18:59 +08:00
433eb89473
EXT-3795 First run messages still display (click & drag on map, Build tools open, movement controlled, etc)
2010-01-14 09:38:46 +08:00
Leyla Farazha