Merge shyotl, setting include broken (disabled)

This commit is contained in:
Siana Gearz
2010-11-09 15:14:34 +01:00
61 changed files with 3320 additions and 2231 deletions

View File

@@ -378,7 +378,7 @@ void LLOverlayBar::refresh()
childSetVisible("voice_remote_container", LLVoiceClient::voiceEnabled());
// always let user toggle into and out of chatbar
static LLCachedControl<bool> chat_visible("ChatVisible",true);
static const LLCachedControl<bool> chat_visible("ChatVisible",true);
childSetVisible("chat_bar", chat_visible);
if (buttons_changed)