0030929554
viewer#2172 AM/PM selector
2025-09-10 22:48:16 +03: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
f9473e8afc
secondlife/viewer#1333 BOOL to bool conversion leftovers: ternaries
2024-05-07 10:18:51 +02: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
2b31dad400
miscellaneous: BOOL (int) to real bool
2024-02-12 23:17:22 +02:00
74a1d2582c
SL-20162 Better cof version logging
...
And fixed some typos
2023-08-17 19:50:16 +03:00
0ca16a1f95
Merge branch 'master' into DRTVWR-527-maint
...
# Conflicts:
# indra/newview/llinventorypanel.cpp
2021-06-25 01:02:04 +03:00
b2d339ff06
SL-14855 Disable edit button for uneditable items
2021-03-25 22:58:26 +02:00
d43d8bc68b
SL-14900 new Landmark creation flow
2021-03-23 17:38:22 +02:00
74d3f9d017
SL-14797 Normalize right-click menus on Landmarks & Picks Part#2
2021-02-05 21:24:04 +02:00
4ff5ad507a
SL-13132 Fixed missing 'owner' label
2020-09-25 19:19:28 +03:00
59b10c2cbc
SL-12335 Show parcel owner's name and icon in landmarks
2020-06-22 20:47:04 +03:00
293f518481
SL-13279 Changes in Landmarks view UI - clarify that Notes are editable
2020-05-26 17:45:01 +03:00
9e79e1a2e2
SL-13132 Emphasize parcel name over region name in Landmarks and Place Profiles
2020-05-06 21:21:50 +03:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
f2c82b096b
MAINT-5347 FIXED Set Landmark title field as the name of the region with coordinates, if the name of parcel is blank.
2015-07-13 17:02:56 +03:00
bb87365c37
Merge viewer-release, become version 3.7.29
2015-04-28 13:36:35 +03:00
de767ca0de
build fix
2015-03-31 12:39:11 +03:00
6cf6c4ba57
fix for MAINT-5021: landmarks not populating correctly when parcel data is missing
2015-03-30 13:43:31 -07:00
23711c9275
Rename llround(..) to ll_round(..) because of a collision with MS llround (long long round) in VS2013
2014-12-10 08:44:08 -08:00
5b846ed2a6
merge with release
2014-03-12 12:48:43 -07:00
e6c85c46c4
MAINT-3555 crash in LLPanel::~LLPanel() on shutdown:
...
- memory leaks fixing;
2014-02-05 20:45:09 +02: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
a2e22732f1
Summer cleaning - removed a lot of llcommon dependencies to speed up build times
...
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
c06c35609c
Updating linux build to gcc4.6
2012-10-11 00:09:04 +00:00
8acc2ec9f6
STORM-690 FIXED Underlying panels were visible in undocked sidepanels.
...
By the way, fixed losing focus when switching between panels in Me and Places SP (which made the floater semi-transparent).
2010-12-06 15:01:36 +02: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
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
9908fc1518
EXT-8391 FIXED Landmark creation and error handling.
...
- Added displaying error messages in Create Landmark panel upon remote parcel request fail.
- Moved landmark creation from LLPanelLandmarkInfo::processParcelInfo() because we use only agent's current coordinates instead of waiting for remote parcel request to complete.
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/793/ .
--HG--
branch : product-engine
2010-07-26 16:14:23 +03:00
3bbb622731
WIP Fix miscellaneous display names in UI
2010-05-28 08:21:33 -07:00
894261e4e4
Fix build errors introduced in last merge
2010-05-13 16:30:15 -07:00
2b7153c26a
merge from dessie/viewer-public right before SLE code landed
2010-05-11 16:11:09 -07:00
bba457e889
Merge from default branch
...
--HG--
branch : product-engine
2010-03-31 10:08:50 +03:00
909091cc0c
EXT-3415 : INFRASTRUCTURE : Move LLInventoryCollectFunctors to separate class
...
Moved all the LLInventoryModelCOllectFunctors from LLInventoryModel to LLInventoryFunctions
2010-03-30 15:56:15 -04:00
ecc2c72650
Merge latest viewer-hotfix, approximately equal to Viewer 2.0 final
2010-03-29 16:55:22 -07:00
5f46430a1a
Normal task (EXT-6251) [HARD CODED]? Side bar: Landmarks > + button > Create Landmark > Landmark location dropdown > Landmarks/Japanese
...
- Fixed translating category name in Landmark location dropdown list for cases when localized name is a part of folder's full name.
Reviewed by Mike Antipov https://codereview.productengine.com/secondlife/r/32/
--HG--
branch : product-engine
2010-03-24 15:47:37 +02:00
5bfb3d5c26
Implemented normal task (EXT-6251) [HARD CODED]? Side bar: Landmarks > + button > Create Landmark > Landmark location dropdown > Landmarks/Japanese.
...
Normal task (EXT-6251) [HARD CODED]? Side bar: Landmarks > + button > Create Landmark > Landmark location dropdown > Landmarks/Japanese.
Reviewed by Richard Nelson https://codereview.productengine.com/secondlife/r/32/
--HG--
branch : product-engine
2010-03-16 14:30:30 +02:00
fe8d015851
Merge
2010-03-02 14:06:23 -08:00
af0bfb388a
CID-132
...
Checker: NULL_RETURNS
Function: LLPanelLandmarkInfo::getFullFolderName(const LLViewerInventoryCategory *)
File: /indra/newview/llpanellandmarkinfo.cpp
2010-02-13 13:33:26 +00:00
9dd7924b19
Merge
2010-02-11 10:09:23 -08:00
69bed1f123
CID-83 follow-up
2010-02-11 13:07:57 +00:00
Andrey Kleshchev