b157ab47c0
Merge branch 'DRTVWR-573-maint-R' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/newview/llagentui.cpp
# indra/newview/llcallingcard.cpp
# indra/newview/llfloateravatarrendersettings.cpp
# indra/newview/llimview.cpp
# indra/newview/llimview.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/skins/default/xui/de/floater_tools.xml
# indra/newview/skins/default/xui/en/floater_display_name.xml
# indra/newview/skins/default/xui/en/floater_tools.xml
# indra/newview/skins/default/xui/es/floater_tools.xml
# indra/newview/skins/default/xui/ru/floater_tools.xml
2023-01-12 16:56:08 +01:00
f01f39afd1
SL-8294 Fixed Incorrect coordinates in address bar
...
Example: Stepping over 183/255/22 will show position 183/1/22 of the same region
2022-12-09 20:56:10 +02:00
a1f1fb3ff4
[OpenSim] Var Region fixups from Oren @ kitely
2021-05-17 20:35:19 +01:00
dc8d291c9f
FIRE-10549 - [OPENSIM] Further HG uniformity checks
...
fixes a specific case of manually typed URIs being treated as http links.
adds additional debug for further testing
refactors ambiguous function name gridURL()
2020-11-15 16:46:06 +00:00
92928c8029
FIRE-10549: Fix SLURL not showing in about floater on SL
2020-11-06 23:05:40 +01:00
112d64ec9a
FIRE-10549 etc. part one of a potentially larger change to come later
...
This fixes the hop grid name issue. The expectation is that an HG grid has a valid GridURL parameter in the OpenSim extras, if not the home grid will be used as normal. Extensions to this such as map copy slurl, and other places may follow in a future release but require more investigation.
2020-11-06 00:35:59 +00:00
cddc7cb040
Merge branch 'rlva/development'
2020-09-19 13:31:34 +02:00
aebcd1855d
Change RLVa string constants over to opt-in constexpr string_views (but keep char* by default)
2020-09-16 01:35:44 +02:00
c10894af2a
FIRE-28958: Show simulator version instead of now gone RC name in the menu bar
2020-04-09 11:26:08 +02:00
0046a76489
Merged with default tip (Revision 353c4cb529e2)
...
--HG--
branch : RLVa
2016-10-03 22:39:14 +02:00
522f24f771
Add "Show Coordinates" option to status bar context menu as well; Also disabled "Show Search Bar" if "Show Navigation and Search Bar" is disabled
2016-10-21 12:55:43 +02:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
0cbfb124ac
FIRE-14988: Avatar coordinates are shown in statusbar when RLVa showloc restriction is set
2014-11-18 16:04:12 +01:00
fd7e737a9b
Merged with default tip (Revision 4798c4f76be3)
...
--HG--
branch : RLVa
2013-11-06 13:46:33 +00:00
10a289598b
Merged with default tip (Revision 74cc289067c8)
...
--HG--
branch : RLVa
2013-07-21 22:33:04 +02:00
64f4246f17
ACME-471: Code cleanup, just moving some code.
2013-06-05 14:54:10 -07:00
3d40f4d82f
ACME-471: Code cleanup, instead of duplicating code from LLAgentUI::buildLocationString, now calling LLAgentUI::buildLocationString with a flag to perform a similar operation.
2013-06-05 14:45:11 -07:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
0a1a351b86
Merge Viewer-Share
2013-10-21 23:51:34 -07:00
8146bbda39
Merge
2013-07-09 16:26:07 -07:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
3020a19cbd
Some code cleanup and adding of FS code tags
2013-07-08 13:41:13 +02:00
850c75e818
FIRE-8063: Support giant-sized var region and megaregion teleports
2012-12-16 08:40:24 -07:00
c93d93fbed
FIRE-1384: Option to show simulator channel in statusbar and notify if simulator version changes on region change
2012-08-25 15:51:37 +02:00
1c2ef4090a
Merged with default tip (Revision f20bf424bd86)
...
--HG--
branch : RLVa
2010-10-30 17:28:00 +02:00
664916d413
FIRE-935: Reordered parcel info icons to V1 layout (Patch from Ansariel Hiller)
2011-04-23 11:46:51 -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
b6a073c659
Initial commit of RLVa-1.2.0i
...
--HG--
branch : RLVa
2010-08-22 10:57:22 +02:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
8b52454990
merge pull from dessie/viewer-public, picking up SLE code
2010-05-13 15:47:32 -07:00
2b7153c26a
merge from dessie/viewer-public right before SLE code landed
2010-05-11 16:11:09 -07:00
658ccc3e85
Re-insert backed out SLE checkin so we can fix it
2010-04-07 11:08:04 -07:00
0bb3f144c0
Backed out changeset 63b699f90efd
2010-04-07 10:37:07 +01:00
aa0a129b67
Automated Merge
2010-04-01 21:47:22 -07: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
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
885fc3f9b5
EXT-6536 : Make LLVOAvatarSelf a singleton
...
Minor superficial cleanup to have all references to getAvatarObject use LLVOAvatarSelf *avatarp = gAgent.getAvatarObject()
2010-03-25 19:56:52 -04:00
9dd7924b19
Merge
2010-02-11 10:09:23 -08:00
8fb7720948
Fixed normal bug EXT-5207 - Region Maturity level not displayed on nav bar when coordinates are enabled and parcel got no name.
...
Added maturity rating to full location string in case parcel name is empty.
--HG--
branch : product-engine
2010-02-11 12:47:47 +02: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
b11a625e6f
Automated merge with a few fixups for code review comments
2010-03-01 15:31:04 -08:00
a2efe4bb41
automated merge
2010-02-26 19:18:15 -08:00
347562844d
Initial implementation of parcel property icons and maturity string on nav bar
...
Added new LLAgentUI location format, renamed unclear old one
Renamed ShowCoordinatesOption to NavBarShowCoordinates
Extended LLLocationInputCtrl to show icons.
Reviewed with Rick
2009-11-23 14:23:51 -08:00
2857dd026c
Implemented normal task EXT-1937 (Please update landmarks and locations to the latest decided format).
...
--HG--
branch : product-engine
2009-11-10 21:55:50 +02:00
5f30904db4
Fixed Windows build.
...
--HG--
branch : product-engine
2009-11-03 12:30:09 +02:00
3a8a93d596
fix for EXT-1232 \"You are Here\" banner for Place Profile - Parcel Characteristics
...
Note:
Now distance check is not depend on Z coordinate
--HG--
branch : product-engine
2009-11-02 21:53:31 +02:00
2bb9751d0a
EXT-1232 Implement \"You are Here\" banner for Place Profile - Parcel Characteristics
...
Note:
\"YouAreHereDistance\" setting has been added to setting.xml
--HG--
branch : product-engine
2009-10-28 13:56:02 +02:00
51500f82e2
svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1480 https://svn.aws.productengine.com/secondlife/pe/stable-2@1489 -> viewer-2.0.0-3
...
* EXT-97 EXT-576 EXT-593 EXT-613 EXT-649 EXT-697 EXT-707 EXT-708 EXT-726 EXT-737
2009-08-28 22:30:09 +00:00
Ansariel