9fdca96f8b
Re-enable compiler warnings C4244 and C4396 except for lltracerecording.h and llunittype.h for now
2024-07-08 20:27:14 +02:00
e2e37cced8
Fix line endlings
2024-05-22 22:40:26 +03:00
1b67dd855c
Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A
...
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/GoogleMock.cmake
# indra/llaudio/llaudioengine_fmodstudio.cpp
# indra/llaudio/llaudioengine_fmodstudio.h
# indra/llaudio/lllistener_fmodstudio.cpp
# indra/llaudio/lllistener_fmodstudio.h
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/llaudio/llstreamingaudio_fmodstudio.h
# indra/llcharacter/llmultigesture.cpp
# indra/llcharacter/llmultigesture.h
# indra/llimage/llimage.cpp
# indra/llimage/llimagepng.cpp
# indra/llimage/llimageworker.cpp
# indra/llimage/tests/llimageworker_test.cpp
# indra/llmessage/tests/llmockhttpclient.h
# indra/llprimitive/llgltfmaterial.h
# indra/llrender/llfontfreetype.cpp
# indra/llui/llcombobox.cpp
# indra/llui/llfolderview.cpp
# indra/llui/llfolderviewmodel.h
# indra/llui/lllineeditor.cpp
# indra/llui/lllineeditor.h
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltextvalidate.cpp
# indra/llui/lltextvalidate.h
# indra/llui/lluictrl.h
# indra/llui/llview.cpp
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappearancemgr.cpp
# indra/newview/llappearancemgr.h
# indra/newview/llavatarpropertiesprocessor.cpp
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llbreadcrumbview.cpp
# indra/newview/llbreadcrumbview.h
# indra/newview/llbreastmotion.cpp
# indra/newview/llbreastmotion.h
# indra/newview/llconversationmodel.h
# indra/newview/lldensityctrl.cpp
# indra/newview/lldensityctrl.h
# indra/newview/llface.inl
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llfloateremojipicker.h
# indra/newview/llfloaterimsessiontab.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/llfloaterprofiletexture.h
# indra/newview/llgesturemgr.cpp
# indra/newview/llgesturemgr.h
# indra/newview/llimpanel.cpp
# indra/newview/llimpanel.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryclipboard.cpp
# indra/newview/llinventoryclipboard.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorygallery.cpp
# indra/newview/lllistbrowser.cpp
# indra/newview/lllistbrowser.h
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofile.h
# indra/newview/llpreviewgesture.cpp
# indra/newview/llsavedsettingsglue.cpp
# indra/newview/llsavedsettingsglue.h
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llurllineeditorctrl.cpp
# indra/newview/llvectorperfoptions.cpp
# indra/newview/llvectorperfoptions.h
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/macmain.h
# indra/test/test.cpp
2024-05-22 19:04:52 +02:00
38c2a5bde9
Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge
2024-05-01 08:16:58 +03:00
1b68f71348
#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed
2024-04-29 07:56:09 +03:00
60d3dd98a4
Convert remaining BOOL to bool
2024-02-21 23:14:31 +02:00
a5261a5fa8
Convert BOOL to bool in llui
2024-02-21 03:00:25 +02:00
c285f59ce2
Replace BOOL with bool in llwindow and dependent classes
2024-02-18 15:51:54 +02:00
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
329268c5f7
Merge branch 'master' into DRTVWR-548-maint-N
...
# Conflicts:
# indra/newview/llmodelpreview.h
2022-09-15 20:44:04 +03:00
0569eb776c
SL-16053 Landmark shouldn't be saved into location history
2022-05-03 22:25:46 +03:00
3f0a0051ba
SL-17036 update menu item similar to NavMesh icon
2022-03-25 18:48:44 +02:00
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
c1139ed9b5
SL-14901 Add a button on the Landmarks bar to open the Places floater
2021-02-25 20:35:07 +02:00
2672093429
DRTVWR-493 LLHint to singleton
2019-06-20 20:03:47 +03:00
fadb6c7c65
MAINT-8459 Save favorite places and landmarks to Location Bar history list
2018-05-25 18:00:57 +03:00
950c41d184
merge 4.0.4-release and MAINT-5974
2016-05-06 10:28:42 -04:00
e5d827bbe9
MAINT-1537 Size of navigation/favourites bars is not saved after restart of viewer
2016-02-04 11:49:37 +02:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
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
6293746b59
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge
2011-11-26 21:21:56 -08:00
b6858df0dd
LLHandle<Derived> is now implicitly convertable to LLHandle<Base> and LLHandle<Base>
...
can be downcast to LLHandle<Derived> using the LLHandleProvider mixin
2011-11-08 13:47:08 -08:00
a507fc259b
finished removing remnants of media browser
2011-11-07 15:04:53 -08:00
9d3fc5d930
EXP-1209 FIXED Sidetray removed.
...
- Removed all sidetray dependencies and the sidetray itself.
- Also removed LLFloaterSidetrayTab and LLSidetrayListener as unused.
2011-09-29 21:43:07 +03:00
679a028fcc
EXP-1203 ADDITIONAL FIX (As a FUI user, I want the address bar and favorites to be on one line)
...
- Removed search combobox by spec
- Fixed EXP-1243 (Parcel characteristics icons from location bar overlay other ui elements)
- Fixed EXP-1245 (More spillover list "jumps" on copying landmarks)
2011-09-26 20:37:02 +03:00
5baf0de6a3
EXP-1203 FIXED (As a FUI user, I want the address bar and favorites to be on one line)
...
- Relocated address bar, combined with favorite landmarks EXP-1208
- Added dragger to change amount of space allocated to address bar and favorites bar EXP-1217
- Modified Favorites ->> More spillover EXP-1218
- Combined context menu menuitems for favorites & address bars EXP-1219
2011-09-19 19:13:39 +03:00
fa3f4d1166
EXP-880 FIX Enable navigation chrome for Search floater
...
search floater derives from floater_web_content
all web content now uses floater_web_content instead of media_browser
2011-07-12 20:58:30 -07:00
f443f3e847
SOCIAL-717 FIX Artwork for click to move hint
...
updated resize logic for hint popups to accomodate image size
2011-03-25 19:13:32 -07:00
5e0b45ad6c
SOCIAL-629 FIX Search Floater accessible from typing a search term in location bar
2011-03-03 19:52:21 -08:00
67be46c78a
made mIsFocusRoot a XUI param
2010-09-28 17:12:50 -07:00
b62b10dd26
Post-convert merge by convert_monolith.py from ./viewer-experience
2010-08-27 16:58:33 -07:00
02d8197019
changed buildPanel/buildFloater to member functions buildFromFile
...
streamlined LLUICtrlFactory's interface
2010-08-20 10:14:28 -07:00
c20bd2dfee
cleaned up LLUICtrlFactory...
...
removed redundant functionality
moved buildPanel to LLPanel
2010-08-16 15:00:51 -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
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
566e3969f9
deprecated LLPanel::child*() methods
2010-07-30 10:02:30 -07:00
3e7af3244f
EXT-7536 FIXED (Favorites bar and Navigation bar looks similar to the mock-up)
...
- Added constant FAVBAR_TOP_PADDING in the LLNavigationBar which defines the distance between navigation panel and favorites panel in pixels.
- Added new image NavBar_BG_NoFav_Bevel which is used to show navigation panel with favorites bar hidden. It is required to show navigation panel with bevel at the bottom.
- Added new image NavBar_BG_NoNav_Bevel which is used to show favorites panel with navigation panel hidden. It is required to show favorites panel with bevel at the top.
- Removed image NavBar_BG_NoFav. It is not used anymore.
- Modified the methods showNavigationPanel and showFavoritesPanel to take into account that distance.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/664/
--HG--
branch : product-engine
2010-07-06 17:30:20 +03:00
5609f78f45
EXT-5808 FIXED Mini-Location panel was added below Navigation Bar
...
- Implemented class LLPanelTopInfoBar (llpaneltopinfobar.h, llpaneltopinfobar.cpp, panel_topinfo_bar.xml). Most of it's implementation is borrowed from LLLocationInputCtrl class.
- Mini-Location panel is turned off by default.
- Added top bar context menu option \"Show Mini-Location Panel\".
- Mini-Location panel displays the same context menu as top bar.
- Added code to initialize LLPanelTopInfoBar in llviewerwindow.cpp.
- Added declaration of the widget in main_view.xml
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/464/
--HG--
branch : product-engine
2010-06-03 18:59:16 +03:00
0473ab08d8
EXT-7034 FIX add initializationagent position at later state in case initialization at earlier state failed.
...
reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/480/
--HG--
branch : product-engine
2010-06-02 18:21:25 +03:00
a11ec0c89f
Automated merge
2010-05-04 16:09:14 -07:00
07b463722e
Fixed bug EXT-6798 (Crash in LLTeleportHistoryStorage).
...
Reason: Attempt to purge empty teleport history resulted in inconsistent history state.
There were two consequences:
1) Further teleports would not properly update the history.
2) Subscribers of history changes were notified of the invalid change and that led to the crash.
My changes:
- added a sanity check to LLTeleportHistoryStorage::onTeleportHistoryChange() to prevent the crash
- purging empty teleport history now does nothing, hence the history doesn't become inconsistent
- removed a redundant (but harmless) call to onTeleportHistoryChanged() from LLNavigationBar::draw() because it's called by LLTeleportHistory::purgeItems() anyway
Reviewed by Mike at https://codereview.productengine.com/secondlife/r/304/
--HG--
branch : product-engine
2010-04-23 17:18:37 +03: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
1147cb1afb
Automated merge from trunk
2010-03-01 18:09:04 -08:00
b11a625e6f
Automated merge with a few fixups for code review comments
2010-03-01 15:31:04 -08:00
5352954eb6
automated merge
2010-02-26 17:34:39 -08:00
Ansariel