summaryrefslogtreecommitdiff
path: root/indra/newview/llversioninfo.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2014-10-21 09:16:56 -0400
committerOz Linden <oz@lindenlab.com>2014-10-21 09:16:56 -0400
commit4c8e526b99cb717e9086dec87a94b56fecad8984 (patch)
tree45294c593721be9bc8def1563b07438554dfa08b /indra/newview/llversioninfo.cpp
parentd3387faca57c560279a6b8b83711a789b84f0ecd (diff)
parenta0a61ff61e6cf38ccbd0d0a9eecb10d532feaf55 (diff)
merge changes for callum fixes and workarounds
Diffstat (limited to 'indra/newview/llversioninfo.cpp')
-rwxr-xr-xindra/newview/llversioninfo.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llversioninfo.cpp b/indra/newview/llversioninfo.cpp
index 6a8fad0134..5cc7d7bed3 100755
--- a/indra/newview/llversioninfo.cpp
+++ b/indra/newview/llversioninfo.cpp
@@ -38,8 +38,6 @@
#error "Channel or Version information is undefined"
#endif
-const char * const LL_CHANNEL = LL_VIEWER_CHANNEL;
-
//
// Set the version numbers in indra/VIEWER_VERSION
//