Skip to content
Snippets Groups Projects
Commit 6dd3f549 authored by callum's avatar callum
Browse files

Simple fix for Hg merge tool shittiness..

parent 532a8ed0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/newview/llfloatermediasettings.cpp
+ 3
− 3
View file @ 6dd3f549
...@@ -268,8 +268,6 @@ const std::string LLFloaterMediaSettings::getHomeUrl() ...@@ -268,8 +268,6 @@ const std::string LLFloaterMediaSettings::getHomeUrl()
return std::string( "" ); return std::string( "" );
} }
}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// virtual // virtual
void LLFloaterMediaSettings::draw() void LLFloaterMediaSettings::draw()
...@@ -300,4 +298,6 @@ void LLFloaterMediaSettings::draw() ...@@ -300,4 +298,6 @@ void LLFloaterMediaSettings::draw()
enableOkApplyBtns(values_changed); enableOkApplyBtns(values_changed);
LLFloater::draw(); LLFloater::draw();
\ No newline at end of file }
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment