summaryrefslogtreecommitdiff
path: root/indra/llui/llfloater.cpp
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2018-05-31 17:10:48 +0100
committerGraham Linden <graham@lindenlab.com>2018-05-31 17:10:48 +0100
commiteb8eaa58a4e28b4db2736000f22fbd97371ef9db (patch)
treef27b7dccc4409bce20d9173a6f17d971c689637e /indra/llui/llfloater.cpp
parentc70119ebabc4b06e2b0db02aea8c56e01fbc666e (diff)
parentf0ae109b696671c5773a5084a7329d0b164b7735 (diff)
Merge storm-2145 dev into lindenlab branch parented from viewer-release
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 a245dd8f78..2dcc62ce79 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -1,5 +1,4 @@
/**
-
* @file llfloater.cpp
* @brief LLFloater base class
*