diff options
author | Josh Bell <josh@lindenlab.com> | 2007-04-04 19:49:24 +0000 |
---|---|---|
committer | Josh Bell <josh@lindenlab.com> | 2007-04-04 19:49:24 +0000 |
commit | 98740db8fd5875033d08b6aef6d9bf5c3c49eeee (patch) | |
tree | dd0e83734e50ffd4d9f87eb2ed4091f867f2f1fd /indra/newview/llviewercontrol.h | |
parent | aa96d1fddff3d5bf68a5014229a0d20584937222 (diff) |
svn merge -r 59826:59968 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
Diffstat (limited to 'indra/newview/llviewercontrol.h')
-rw-r--r-- | indra/newview/llviewercontrol.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewercontrol.h b/indra/newview/llviewercontrol.h index 389f0e8bc6..2203df4287 100644 --- a/indra/newview/llviewercontrol.h +++ b/indra/newview/llviewercontrol.h @@ -36,7 +36,7 @@ protected: //setting variables are declared in this function void declare_settings(); -void settings_version_fixup(); +void fixup_settings(); // saved at end of session extern LLControlGroup gSavedSettings; |