diff options
author | Oz Linden <oz@lindenlab.com> | 2012-06-21 14:19:25 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-06-21 14:19:25 -0400 |
commit | f64a79d9d14fe52dc9ac599bc9e4faf8009254ce (patch) | |
tree | d14ff8f9cf8bd723b8d479446f47eeb4211e8326 /indra/newview/llviewerwindow.cpp | |
parent | ee130adc60dea8530f82d90107198ebcbd63fded (diff) | |
parent | 4539e5c8e93badc83e71045ba87ef81bf8740cab (diff) |
merge changes for DRTVWR-171
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
-rwxr-xr-x | indra/newview/llviewerwindow.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 39e330ad66..fc6ef170c8 100755 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1704,9 +1704,6 @@ LLViewerWindow::LLViewerWindow(const Params& p) // Can't have spaces in settings.ini strings, so use underscores instead and convert them. LLStringUtil::replaceChar(mOverlayTitle, '_', ' '); - // sync the keyboard's setting with the saved setting - gSavedSettings.getControl("NumpadControl")->firePropertyChanged(); - mDebugText = new LLDebugText(this); mWorldViewRectScaled = calcScaledRect(mWorldViewRectRaw, mDisplayScale); |