diff --git a/indra/cwdebug/debug.h b/indra/cwdebug/debug.h
index 6c6d71908..9ca1886da 100644
--- a/indra/cwdebug/debug.h
+++ b/indra/cwdebug/debug.h
@@ -387,21 +387,21 @@ void InstanceTracker<T>::dump(void)
 // Print "Entering " << \a data to channel \a cntrl and increment
 // debugging output indentation until the end of the current scope.
 #define DoutEntering(cntrl, data) \
-  int __slviewer_debug_indentation = 2;                                                                      \
+  int __slviewer_debug_indentation = 2;                                                                                 \
   {                                                                                                                     \
     LIBCWD_TSD_DECLARATION;                                                                                             \
     if (LIBCWD_DO_TSD_MEMBER_OFF(::libcwd::libcw_do) < 0)                                                               \
     {                                                                                                                   \
       ::libcwd::channel_set_bootstrap_st __libcwd_channel_set(LIBCWD_DO_TSD(::libcwd::libcw_do) LIBCWD_COMMA_TSD);      \
-      bool on;                                                                                                          \
+      bool __slviewer_debug_on;                                                                                         \
       {                                                                                                                 \
         using namespace LIBCWD_DEBUGCHANNELS;                                                                           \
-        on = (__libcwd_channel_set|cntrl).on;                                                                           \
+        __slviewer_debug_on = (__libcwd_channel_set|cntrl).on;                                                          \
       }                                                                                                                 \
-      if (on)                                                                                                           \
+      if (__slviewer_debug_on)                                                                                          \
         Dout(cntrl, "Entering " << data);                                                                               \
       else                                                                                                              \
-        __slviewer_debug_indentation = 0;                                                                    \
+        __slviewer_debug_indentation = 0;                                                                               \
     }                                                                                                                   \
   }                                                                                                                     \
   debug::Indent __slviewer_debug_indent(__slviewer_debug_indentation);