summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatercreatelandmark.cpp
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2021-07-19 22:22:42 +0300
committerAndrey Lihatskiy <alihatskiy@productengine.com>2021-07-19 22:22:42 +0300
commit3a476a8296c78eef1007c6fdca7188e78f9b6280 (patch)
tree8f4e061aacccf82813048634d22b760adf7f6fe2 /indra/newview/llfloatercreatelandmark.cpp
parent8b5fe507a439c73ac22fdd71c4083d42cf351d79 (diff)
parentbe6066eae218856f7fd74b98968a75e5062fa830 (diff)
Merge branch 'master' into DRTVWR-530-maint
Diffstat (limited to 'indra/newview/llfloatercreatelandmark.cpp')
-rw-r--r--indra/newview/llfloatercreatelandmark.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloatercreatelandmark.cpp b/indra/newview/llfloatercreatelandmark.cpp
index eb93a6a75a..6b1d9306fb 100644
--- a/indra/newview/llfloatercreatelandmark.cpp
+++ b/indra/newview/llfloatercreatelandmark.cpp
@@ -320,4 +320,4 @@ void LLFloaterCreateLandmark::setItem(const uuid_set_t& items)
}
}
}
-} \ No newline at end of file
+}