Ansariel
00464b15cd
Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/llfolderviewitem.cpp
# indra/llui/llui.h
# indra/llxml/llcontrol.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llfloateravatarpicker.cpp
# indra/newview/llimprocessing.cpp
# indra/newview/llnavigationbar.cpp
# indra/newview/lltextureview.cpp
# indra/newview/lltoolpie.cpp
# indra/newview/llvieweraudio.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewerwindow.cpp
2023-09-22 20:47:05 +02:00
Andrey Kleshchev
145a5ffe7f
SL-15039 Prune unused preferences #3
...
DebugInventoryFilters
DebugShowXUINames
DebugSlshareLogTag
DebugStat****
DefaultBlankNormalTexture
DefaultObjectNormalTexture
DefaultObjectSpecularTexture
DefaultUploadCost
DisplayAvatarAgentTarget
DisplayChat
DisplayDebug
DisplayDebugConsole
DisplayIM
DisplayLinden
DisplayRegion
DragAndDropToolTipDelay
DragAndDropDistanceThreshold
DropShadowButton
DropShadowFloater
DropShadowSlider
DropShadowTooltip
UIImgWhiteUUID
UseEnvironmentFromRegion
UseDayCycle
WaterPresetName
SkyPresetName
DayCycleName
DestinationGuideHintTimeout
SidePanelHintTimeout
DisablePrecacheDelayAfterTeleporting
2023-09-22 19:28:23 +03:00
Ansariel
656dd12dfc
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/newview/llmodelpreview.h
2022-09-15 20:35:44 +02:00
Andrey Lihatskiy
329268c5f7
Merge branch 'master' into DRTVWR-548-maint-N
...
# Conflicts:
# indra/newview/llmodelpreview.h
2022-09-15 20:44:04 +03:00
Ansariel
711799a7d5
Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
2022-05-05 11:28:38 +02:00
Andrey Kleshchev
0569eb776c
SL-16053 Landmark shouldn't be saved into location history
2022-05-03 22:25:46 +03:00
Ansariel
ac2ee57edb
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/FMODSTUDIO.cmake
# indra/llaudio/llaudioengine_fmodstudio.cpp
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llfloatersearch.cpp
# indra/newview/llgroupactions.cpp
# indra/newview/lllocationinputctrl.h
# indra/newview/llnavigationbar.cpp
# indra/newview/llnavigationbar.h
# indra/newview/viewer_manifest.py
# indra/viewer_components/login/lllogin.cpp
2022-04-19 15:27:35 +02:00
Mnikolenko Productengine
3f0a0051ba
SL-17036 update menu item similar to NavMesh icon
2022-03-25 18:48:44 +02:00
Ansariel
f46a15b3f3
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
2022-01-11 15:04:11 +01:00
Mnikolenko Productengine
b6f36a6159
SL-16535 FIXED The Search floater opens without appropriate search results after performing a search from the NavBar
2021-12-21 17:16:00 +02:00
Zi Ree
b6c1e98b3e
FIRE-31079 - remove references to unused LLPanelTopInfoBar
2021-08-21 19:51:24 +02:00
Ansariel
51cdac3054
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm
2021-05-31 09:12:27 +02:00
Beq
a1f1fb3ff4
[OpenSim] Var Region fixups from Oren @ kitely
2021-05-17 20:35:19 +01:00
Ansariel
d36f1c75ad
Merge branch 'DRTVWR-518-ui' of https://bitbucket.org/lindenlab/viewer
2021-03-03 15:08:10 +01:00
Mnikolenko Productengine
c1139ed9b5
SL-14901 Add a button on the Landmarks bar to open the Places floater
2021-02-25 20:35:07 +02:00
Ansariel
d204cf739f
FIRE-29571: Turn "Sky" button into "Personal Lighting" button on navigation bar (and make it respect RLVa @setenv restriction)
2020-05-19 00:52:55 +02:00
Ansariel
d79b79fbe2
Merge viewer-ordered-shutdown
2019-10-19 03:16:10 +02:00
andreykproductengine
2672093429
DRTVWR-493 LLHint to singleton
2019-06-20 20:03:47 +03:00
Ansariel
e97c25531c
Merge viewer-neko
2018-05-25 22:05:19 +02:00
maxim_productengine
fadb6c7c65
MAINT-8459 Save favorite places and landmarks to Location Bar history list
2018-05-25 18:00:57 +03:00
Ansariel
d171e16c58
Merge Firestorm LGPL
2016-03-18 10:16:25 +01:00
Ansariel
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
Ansariel
c6eeeeaf43
Merge viewer-bear
2016-02-04 22:41:31 +01:00
Mnikolenko ProductEngine
e5d827bbe9
MAINT-1537 Size of navigation/favourites bars is not saved after restart of viewer
2016-02-04 11:49:37 +02:00
Oz Linden
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
Oz Linden
950c41d184
merge 4.0.4-release and MAINT-5974
2016-05-06 10:28:42 -04:00
Kitty Barnett
6e9905881e
Merge with general/AIS/big bird appearance and RLVa fixes + general RLVa code sync madness
2015-07-18 03:51:33 +02:00
Ansariel
871dd17c68
Minor clean up in LLNavigationBar
2015-04-22 15:08:35 +02:00
Kitty Barnett
c4d557d529
Merged with default tip (Revision aeab2661776f)
...
--HG--
branch : RLVa
2014-10-29 21:45:12 +02:00
Tank_Master
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
Cinders
cded3b01a1
FIRE-12333: Navigation bar Home, Forward, and Back buttons don't release focus after commit
2013-11-25 19:53:14 -07:00
Kitty Barnett
0d724b0387
- internal : minor refactoring of the process of updating the navigation and top info bars when toggling @showloc
...
--HG--
branch : RLVa
2014-03-23 15:15:45 +01:00
Richard Linden
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Graham Madarasz
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
Cinders
3433a51756
FIRE-11847: Make Sky button functional again
2013-10-10 23:16:48 -06:00
ziree
7bb85fbbab
Convert navigationbar to a real XUI element with its own space, fixes top part of the screen not passing clicks through to the world.
2013-09-09 22:53:11 +02:00
Tank_Master
8146bbda39
Merge
2013-07-09 16:26:07 -07:00
Tank_Master
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
Ansariel
c0450ad230
More code cleanup
2013-07-08 17:23:17 +02:00
Cinders
2c9e821188
Rename HAS_OPENSIM_SUPPORT switch to OPENSIM
2013-02-18 21:24:20 -07:00
Armin Weatherwax
d0cc27c262
fix FIRE-7044 mapto command in OSgrid does not work
2012-07-24 00:41:04 +02:00
Paul ProductEngine
44045a233b
MAINT-807 FIXED ([PUBLIC]Button Clear history from Preferences isn't clear last teleport)
...
- The order of clearing LLTeleportHistory and LLTeleportHistoryStorage does matter:
first LLTeleportHistory must be cleared after LLTeleportHistoryStorage.
Clearing LLTeleportHistory from LLNavigationBar::draw() breaks this order (see callback_clear_browser_cache)
2012-03-24 10:29:23 +02:00
Ansariel
7b36c82646
Cleaned up LLNavigationBar and removed orphaned and deprecated FS-specific code
2012-06-22 22:36:10 +02:00
Tank_Master
e757189f8d
Merge LL 3.3.3 to FS LGPL
2012-06-22 09:52:28 -07:00
Armin Weatherwax
d61879d179
better support for hypergrid jumps
2012-06-19 20:32:38 +02:00
Tank_Master
991d43709c
merge LL 3.3.3 beta
2012-06-16 07:22:27 -07:00
Armin Weatherwax
dc2322303a
backout a47635dca932 it breaks saved login data for SL
2012-06-07 00:40:10 +02:00
Armin Weatherwax
f1b03ba324
update gridmanager engine; add better Hypergrid support
2012-06-06 17:09:07 +02:00
ziree
fc0ac28550
Fixed navigation/favorites bar to use visibility controls, removed in-code GUI calculations. Fixes FIRE-5709
2012-05-25 17:43:45 +02:00
Ansariel
460e978d7f
Made navigation and favorites bar visible independent again (FIRE-5016)
2012-02-23 21:17:02 +01:00