Andrey Lihatskiy
e0ace0c722
Merge branch 'master' into DRTVWR-570-maint-Q
...
# Conflicts:
# indra/newview/llnetmap.cpp
# indra/newview/llnetmap.h
2022-10-20 22:34:11 +03:00
Andrey Kleshchev
6f946b6b16
SL-18165 Tighten up some command permissions
2022-10-11 17:29:44 +03: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
Mnikolenko Productengine
e3ef38876b
SL-17785 FIXED World Map scrolls too slowly after pressing "Me" button
2022-08-04 17:45:06 +03:00
Andrey Lihatskiy
59ab8e78f4
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/newview/llpanelface.cpp
# indra/newview/llpanelface.h
# indra/newview/llpanelobject.cpp
2022-08-04 00:17:55 +03:00
Andrey Lihatskiy
ea26ee5e92
Merge branch 'master' into DRTVWR-548-maint-N
...
# Conflicts:
# indra/newview/llfloaterworldmap.cpp
# indra/newview/llvovolume.cpp
2022-08-04 00:15:36 +03:00
Mnikolenko Productengine
38cc06e43a
SL-17785 FIXED World Map scrolls too slowly when searching for a region.
2022-07-18 16:53:43 +03:00
Mnikolenko Productengine
59c586d0c6
SL-17666 Allow Map sidebar UI to be hidden
2022-07-07 18:14:49 +03:00
Andrey Lihatskiy
b5406352e9
DRTVWR-548 post-merge build fix
2022-04-19 00:01:52 +03:00
Andrey Lihatskiy
026ad511ea
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llfloatersearch.cpp
# indra/newview/llgroupactions.cpp
# indra/newview/llvovolume.cpp
2022-04-18 20:43:49 +03:00
Andrey Lihatskiy
16494f4400
Merge branch 'master' into DRTVWR-548-maint-N
2022-04-18 20:38:56 +03:00
Cosmic Linden
9bca1aa8fb
SL-15232: Clang format
2022-04-05 11:55:34 -07:00
Cosmic Linden
c6cba3a67d
SL-15232: Clean up LLWorldMapView a bit.
...
Avoid a static variable hack and convert a few related variables/methods to non-static as well
2022-04-05 11:55:34 -07:00
Cosmic Linden
288fbe2317
SL-15232: Fix top/right edges of main map not being scrollable
2022-04-05 11:55:34 -07:00
Cosmic Linden
d3a616122f
SL-15232: Test to scroll mouse wheel to map position on main map/minimap
2022-04-05 11:55:34 -07:00
Mnikolenko Productengine
d97105663f
SL-17091 FIXED Walk/Run/Fly buttons are not clickable
2022-03-29 18:07:06 +03:00
Mnikolenko Productengine
b3cd910e75
SL-17037 Center map on current location after teleporting
2022-03-23 15:37:58 +02:00
Andrey Kleshchev
6987dcfd62
SL-11011 Multiselect, scroll to selection and search fix for estate's ban list
2022-02-02 20:44:08 +02:00
Mnikolenko Productengine
8ca811f849
SL-14799 add "Hide beacon" button
2021-07-09 16:43:10 +03:00
andreykproductengine
c61d0f4297
DRTVWR-493 LLUI to LLParamSingleton
2019-08-10 15:31:03 +03:00
maxim_productengine
f8106e9f3f
SL-9991 FIXED Crash in LLViewerLODTexture::processTextureStats()
2018-11-05 17:52:45 +02:00
maxim_productengine
5ed2790ff9
MAINT-2375 FIXED World Map always shows first friend location after search for some users
2018-01-25 18:14:32 +02:00
Nat Goodspeed
1771857e6c
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2017-03-06 14:27:29 -05:00
andreykproductengine
596018361c
MAINT-965 FIXED Teleport to friend location in world map omits Z value
2016-12-26 19:08:46 +02:00
Nat Goodspeed
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
AndreyL ProductEngine
b25a22a2c1
Merged in lindenlab/viewer-release
2016-05-19 23:02:37 +03:00
Mnikolenko Productengine
e05c7d70d4
MAINT-1639 FIXED map seach clears itself when you are at the first place in map search
2016-04-28 13:06:55 +03:00
Oz Linden
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
Mnikolenko ProductEngine
bb87365c37
Merge viewer-release, become version 3.7.29
2015-04-28 13:36:35 +03:00
Mnikolenko ProductEngine
2b9be2ac8c
MAINT-4784 FIXED Don't clear destination beacon, when text is unchanged in input boxes.
2015-04-17 11:52:29 +03:00
Oz Linden
a8ef252571
merge changes for 3.7.27-release
2015-04-13 16:23:36 -04:00
Mnikolenko ProductEngine
8f04b738d2
MAINT-2742 FIXED Duplicate Display Names appear once in share picker
2015-01-12 11:54:24 +02:00
Mnikolenko ProductEngine
c2bd14193d
MAINT-4739 FIXED Restore cursor when WorldMap floater loses focus.
2014-12-12 12:09:17 +02:00
callum_linden
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
Richard Linden
5866bb7ef0
merge with release
2014-02-12 10:32:02 -08:00
Jonathan Yap
db8e4824e7
STORM-1986 Added right click Show on Map context menu for Inventory floater landmarks
...
Possible fix for BUG-4593
2013-11-26 19:43:15 -05:00
Richard Linden
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
Oz Linden
b8320207bb
merge changes for storm-1557
2011-08-15 16:22:03 -04:00
Leslie Linden
b6685b5872
EXP-1065 FIX -- Inventory has slowed to a crawl. Clicking between items has an average one second delay. Same with switching between tabs.
...
* Removed numerous places in the code that called findChild across the inventory panel unnecessarily.
* Conglomerated uses of inbox and outbox inventory panels to the sidepanel class so the pointers can be cached and functionality like selection handling can be done more efficiently.
* Optimized LLView::childHasKeyboardFocus() to work backwards up from the focus object rather than searching for children that may or may not turn out to have focus.
Reviewed by Richard.
2011-08-08 15:13:53 -07:00
Vadim ProductEngine
ba475c35eb
STORM-1427 FIXED Fixed a debug assertion triggered in the world map floater.
...
Apparently, passing empty region name to the MapNameRequest makes server return
empty name in MapBlockReply, which triggered the assertion.
2011-08-05 23:31:10 +03:00
Oz Linden
181c34c984
merge changes for vwr-26066
2011-07-19 15:43:38 -04:00
Kadah_Coba
b46f89e280
VWR-25753 Searching in the world map clears the destination arrow but not the destination beacon
2011-07-01 17:15:51 -07:00
Boroondas Gupte
90287404b2
merged VWR-26066: request LLFloaterWorldMap child "zoom slider" with correct type
...
LLSliderCtrl instead of LLSlider to get rid of warning when opening map flaoter
2011-06-20 15:22:11 +02:00
Boroondas Gupte
c9eae38156
VWR-26066: FIXED request LLFloaterWorldMap child "zoom slider" with correct type
...
LLSliderCtrl instead of LLSlider to get rid of warning when opening map flaoter
2011-06-20 15:16:27 +02:00
Ansariel Hiller
786da1eb38
VWR-25480 Worldmap: Partial region name search UI bug
...
Patch converted and tested by Jonathan Yap
2011-06-11 18:10:19 -04:00
Don Kjer
ae8ed3fc2d
Merge with viewer-development
2011-05-17 19:21:55 +00:00
Oz Linden
2ace3d7ce4
merge changes for storm-1128b
2011-05-02 07:26:29 -04:00
Jonathan Yap
838b38d238
STORM-1128 Add space after a comma
2011-04-19 13:24:46 -04:00
Jonathan Yap
def000ea49
STORM-1128 Made a few code changes suggested in code review comments.
2011-04-16 16:49:47 -04:00
Jonathan Yap
8c797002cf
STORM-1128 GCC fixes: formatting changes, moved compare routine back to top
2011-04-16 09:21:24 -04:00