summaryrefslogtreecommitdiff
path: root/indra/llui/llfloater.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2020-05-18 16:33:16 -0400
committerNat Goodspeed <nat@lindenlab.com>2020-05-18 16:33:16 -0400
commit89c5b4623e09fbe98cddf4a3a42e13e6e1fce230 (patch)
tree52dc42818c76374a7d27b58d82c1cd7171f9c127 /indra/llui/llfloater.cpp
parent9d5d257ceeb8297bcd8ac17164b6584717b5c024 (diff)
parented3d9abdd01304b5a9708880d9b150fb6568256b (diff)
DRTVWR-476: Merge branch 'master' of lindenlab/viewer into DRTVWR-476-boost-1.72
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
*