summaryrefslogtreecommitdiff
path: root/indra/llui/llfloater.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2020-05-19 19:33:30 +0100
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2020-05-19 19:33:30 +0100
commit37f5e2aab38172df02dfa8875e7e8560f956cd46 (patch)
tree9583349a031fb63e9220c6fbca93b25775e1f26b /indra/llui/llfloater.cpp
parenta1cfa9ddb297f5bc66dd363800e69d4a7089467c (diff)
parented3d9abdd01304b5a9708880d9b150fb6568256b (diff)
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into SL-12995
Diffstat (limited to 'indra/llui/llfloater.cpp')
-rw-r--r--indra/llui/llfloater.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index e3bb36192c..abb043f428 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -1,5 +1,4 @@
/**
-
* @file llfloater.cpp
* @brief LLFloater base class
*