Ansariel
|
9ee1a75474
|
Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# indra/llcharacter/llkeyframemotion.cpp
# indra/llcommon/lluuid.cpp
# indra/llcommon/lluuid.h
# indra/llui/llscrolllistctrl.cpp
# indra/llui/llscrolllistctrl.h
# indra/newview/app_settings/settings.xml
# indra/newview/llfloatersettingsdebug.cpp
# indra/newview/llfloatersettingsdebug.h
# indra/newview/skins/default/xui/en/floater_settings_debug.xml
# indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
|
2022-11-01 17:17:56 +01:00 |
|
Andrey Lihatskiy
|
91f9f2e9f7
|
DRTVWR-570 Mac build fix: unused variables cleanup
|
2022-10-27 23:08:09 +03:00 |
|
Ansariel
|
f9f81ebe20
|
Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
|
2022-07-22 12:19:11 +02:00 |
|
Ansariel
|
e82f8b16cb
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
|
2022-07-22 12:13:41 +02:00 |
|
Andrey Kleshchev
|
798e38051c
|
SL-17814 Crash at landmark's onCommitTextChanges
|
2022-07-22 02:14:54 +03:00 |
|
Ansariel
|
4bb796150f
|
FIRE-31689: Landmark initially shown in wrong folder while creating
|
2022-07-10 13:19:39 +02: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
|
d647b75310
|
SL-17314 Location and label desync
Example: User can rename item in inventory, then attempt to save new landmark and changes will be lost
|
2022-05-05 01:05:01 +03:00 |
|
Andrey Kleshchev
|
ad8634856d
|
SL-17314 Don't focus inventory when handling landmark creation
|
2022-05-04 22:23:03 +03:00 |
|
Ansariel
|
4e3ecee43d
|
Revert "Revert "FIRE-31031 New Create Landmark Floater: Default to Landmarks Folder""
This reverts commit ae3fc753f9.
|
2021-07-15 13:31:54 +02:00 |
|
Andrey Kleshchev
|
35f2b14c1d
|
Revert "SL-15434 Change default landmark destination"
This reverts commit efc8b268a2.
|
2021-07-13 00:05:04 +03:00 |
|
Andrey Kleshchev
|
efc8b268a2
|
SL-15434 Change default landmark destination
|
2021-06-30 23:24:27 +03:00 |
|
Mnikolenko Productengine
|
7d726d1b4a
|
SL-15319 FIXED Crash in LLFloaterCreateLandmark::onCancelClicked
|
2021-05-27 02:17:39 +03:00 |
|
Mnikolenko Productengine
|
100fa900c0
|
SL-14900 remove created landmark when clicking Cancel button
|
2021-03-29 18:32:02 +03:00 |
|
Mnikolenko Productengine
|
d43d8bc68b
|
SL-14900 new Landmark creation flow
|
2021-03-23 17:38:22 +02:00 |