summaryrefslogtreecommitdiff
path: root/indra/llcommon/llmemtype.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-02-17 14:56:33 -0500
committerOz Linden <oz@lindenlab.com>2011-02-17 14:56:33 -0500
commitc1901890576d3b9442846c8890b1724438eab46e (patch)
tree7d76da988c79d3b11fc2fc5e51d5f2c0248abaf0 /indra/llcommon/llmemtype.cpp
parent10cf492ef1730e869389b704345a6604ed363427 (diff)
parentfb94ad7646b5c8a2eaa65e41b0b8b1679652d956 (diff)
merge changes for storm-937
Diffstat (limited to 'indra/llcommon/llmemtype.cpp')
-rw-r--r--indra/llcommon/llmemtype.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llcommon/llmemtype.cpp b/indra/llcommon/llmemtype.cpp
index fe83f87d4b..6290a7158f 100644
--- a/indra/llcommon/llmemtype.cpp
+++ b/indra/llcommon/llmemtype.cpp
@@ -229,3 +229,4 @@ char const * LLMemType::getNameFromID(S32 id)
return DeclareMemType::mNameList[id];
}
+//--------------------------------------------------------------------------------------------------