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
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
f1b7ba6c28
SL-16916: Update minimap context menu with new options and reworded existing options
...
Map rotation: Split minimap "Rotate Map" context menu option into two options: "North at top" and "Camera at top"
Zoom:
- Adjust minimap context menu zoom presets: New presets are "far", "medium", "close", and "very close"
- Change default minimap zoom level from 128 to 64
- Currently selected minimap zoom level is now checked
About Land: Add "About Land" button to minimap context menu
Reword: Rearrange and adjust capitalization of the various context menu options
Code change: Remove unused zoom handling code in LLFloaterMap
2022-04-05 11:55:33 -07:00
0e927e92f3
SL-16824: Fix minimap tooltip hint not updating until viewer restart (double click to show map vs double click to teleport)
2022-03-03 12:30:59 -08:00
81da0dd2db
SL-16824: Change minimap hover tooltip. Show parcel name, owner name, and/or for sale info when available. Remove "shift-drag to pan" hint.
2022-03-03 12:30:58 -08:00
34a9e84cd8
SL-16917: Fix minimap cardinal direction text being offset slightly, and move cardinal directions to the edge of the minimap
2022-02-23 16:39:15 -08:00
573287b50f
DRTVWR-418: Fix API for LLTracker::stopTracking().
...
The signature for LLTracker::stopTracking() was silly: it accepted a void* for
the sole purpose of testing whether it was NULL. In other words, the parameter
was really a bool in void* clothing. Most callers passed NULL.
What got ugly was when you wanted to pass 'true', or a variable bool value.
Such values had to be cast to void*. In 64-bit land, the compiler correctly
flags that as extremely dubious practice.
But it's entirely unnecessary. Since stopTracking() wants a bool, change its
parameter to bool. Everybody wins.
(While at it, change a few related method params from BOOL to builtin bool.)
2016-12-20 09:44:10 -05:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05: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
bdce32a02b
Update to build on Xcode 6.0: collection of removal of unused variables [-Wunused-variable]
2014-10-18 11:56:23 -07:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
4b44be799a
MAINT-1416 FIXED Close Mini-map floater after Ctrl-W if it's opened and other floaters are not in focus
2012-08-21 18:10:45 +03:00
ba7e1ec1d4
MAINT-328 FIXED Use stopTracking() before each new beacon
2012-08-08 17:55:04 +03:00
30527b2206
EXP-1409 FIX WASD controls don't move avatar while Move floater is in focus
...
moved "chrome" flags to xui
separated hiding floater title from setting chrome
toolbar toggle button now moves floaters to frontmost and doesn't necessarily rely on focus
2011-10-18 14:09:52 -07:00
530d5af407
EXP-1204 PROGRESS -- As a User I want flexible floater management with no sidetray
...
EXP-1292 FIX -- Mini-map floater can't be closed by clicking the sidebar button again.
* Mini-map floater text updated
* Mini-map floater behavior now acts more like other windows, has a title, etc.
2011-10-04 12:05:27 -07:00
cb47ae3264
merge changes for storm-971
2011-03-21 06:59:55 -04:00
2cddf137e3
STORM-971 FIXED Disable the 'Stop Tracking' menu item in Mini-map floater when tracking gets stopped.
...
- Removed the menu from LLFloaterMap (the mini-map floater)
that had conflicted with the one in the LLNetMap widget.
- Fixed updating of the "Stop Tracking" menu item; moved that code
out of draw() to avoid excessive updates.
- Preventively fixed LLTracker::isTracking() to return strictly 1 or 0
(BOOL is known to cause hard-to-debug side effects with values > 1
because it's essentially just an int and thus doesn't enforce
any limitations on the value).
2011-03-14 17:37:56 +02:00
7ffd09a697
Merge
2011-03-01 17:16:37 -08:00
0d5b0cad14
Embed Minimap into the Nearby list of the People Sidebar
2011-01-26 19:22:42 -05:00
78895f9e0c
merge changes for storm-467
2011-01-04 16:45:08 -05:00
ef5f9ee893
STORM-466 Fix for: minimap cannot be reset to default zoom
2010-12-22 08:47:43 -05:00
09c7d38166
STORM-467 Fix for minimap zoom does not persist to the next session
2010-12-18 16:44:51 -05:00
87e2b01fbb
STORM-420 : Took Andrew's comment into account, fixing the issue when minimap was minimized
2010-11-01 17:28:28 -07:00
398b8564e1
STORM-420 : allow teleport when double clicking the minimap if doubleclick teleport is on, allow beacon setting if not
2010-10-29 15:42:29 -07:00
ac76af0e2d
STORM-299 : merge
2010-10-06 22:21:24 -07:00
d950a97af0
STORM-299 FIXED World map floater opening instead Mini-map if double-click on minimized Mini-map.
...
- What map floater is shown on Mini-map doublecklick now differs depending on whether it is minimized.
2010-10-06 14:02:34 +03:00
2b5cfc2a4d
VWR-13221 (SNOW-188) FIXED Allow panning of the minimap
...
Imported from Snowglobe.
2010-09-01 14:14:35 +01:00
1911993cc7
merge
2010-09-16 19:45:57 -07:00
b62b10dd26
Post-convert merge by convert_monolith.py from ./viewer-experience
2010-08-27 16:58:33 -07:00
124bc854dd
moved buildFloater out of lluictrlfactory to llfloater.cpp
2010-08-16 17:44:23 -07:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
0d099b4f08
EXT-7882 FIX Set caption when floater minimized and remove when maximized.
...
reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/624/
--HG--
branch : product-engine
2010-06-22 15:47:36 +03:00
d807db70e0
EXT-7605 FIX fix consequences. to play safe reduce ctrl size
...
reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/540/
--HG--
branch : product-engine
2010-06-09 19:07:21 +03:00
129d504dd9
EXT-7550 FIX fix floater height and minimap position right after start.
...
reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/497/
--HG--
branch : product-engine
2010-06-02 18:23:06 +03:00
d3cfb6ca36
EXT-7112 fix Set map pos,bgnd and size in code to match mockup
...
--HG--
branch : product-engine
2010-05-18 17:57:04 +03:00
a5227864bd
Manual merge from default branch
...
Resolved conflict in indra/newview/llviewerwindow.cpp.
--HG--
branch : product-engine
2010-03-26 19:00:27 +02:00
4d8338ff3e
Fixen normal EXT-6434 (Mini Map does not go transparent when not in focus)
...
- Set background opaque of the floater depending on focus and made map's background color transparent
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/99/
--HG--
branch : product-engine
2010-03-26 09:47:42 +02: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
3650ef0d9f
fix for normal EXT-4512 [BSI] Can't minimize Mini-Map
...
actually this has nothing with original bug description so...fix map and text pos on map resize
--HG--
branch : product-engine
2010-02-01 16:30:48 +02:00
1631ca7173
fix for normal EXT-4512 [BSI] Can't minimize Mini-Map
...
also this fix EXT-2119 even if its marked as fixed...
--HG--
branch : product-engine
2010-01-28 10:34:12 +02:00
6d6ee6af54
EXT-2226 Add "Rotate Mini Map" toggle to mini-map context menu
...
Reviewed with Kelly
2009-11-17 12:03:57 -08:00
35e200881c
merge QAR-1829: texture pipeline branch in viewer-2.0.0.3
2009-11-06 06:52:24 +00:00
8799193fde
EXT-946 There is no terrain on the Mini-Map. Unclear if this fixes the problem or not, does not reliably repro for me. Found several uninitialized variables in LLNetMap and fixed those. Reviewed with Richard.
2009-10-14 23:02:38 +00:00
c4384d64a1
EXT-729 - moved XML from menu_minimap.xml to menu_mini_map.xml and deleted menu_minimap.xml (translations all have menu_mini_map.xml)
2009-08-29 01:47:33 +00:00
52aeaa3284
Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files:
...
lldraghandle.h, lluictrl.h, llchiclet.cpp, llfolderview.h/cpp, lliinventorybridge.cpp, llpanelpicks.cpp, llviewermenu.cpp, floater_mute.xml, floater_preferences.xml, notifications.xml, panel_preferences_audio.xml, panel_preferences_graphics1.xml, panel_region_general.xml
svn merge -r124961:126284 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-14
2009-07-07 00:53:05 +00:00
9ec432034d
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
...
ignore-dead-branch
2009-06-21 08:04:56 +00:00
Ansariel