diff options
| author | callum <none@none> | 2009-11-30 17:55:19 -0800 |
|---|---|---|
| committer | callum <none@none> | 2009-11-30 17:55:19 -0800 |
| commit | 6dd3f54924b57224298f6d76c766b403d165783f (patch) | |
| tree | 4310984bc5838a989ef0b48c773b7e0347f4a357 /indra | |
| parent | 532a8ed0567878737cfc41ec516dbd1dec76003d (diff) | |
Simple fix for Hg merge tool shittiness..
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloatermediasettings.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llfloatermediasettings.cpp b/indra/newview/llfloatermediasettings.cpp index 1446b828c9..16a76723eb 100644 --- a/indra/newview/llfloatermediasettings.cpp +++ b/indra/newview/llfloatermediasettings.cpp @@ -268,8 +268,6 @@ const std::string LLFloaterMediaSettings::getHomeUrl() return std::string( "" ); } -} - //////////////////////////////////////////////////////////////////////////////// // virtual void LLFloaterMediaSettings::draw() @@ -300,4 +298,6 @@ void LLFloaterMediaSettings::draw() enableOkApplyBtns(values_changed); - LLFloater::draw();
\ No newline at end of file + LLFloater::draw(); +} + |