summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan O'Sullivan <bos@lindenlab.com>2009-07-28 15:18:22 -0700
committerBryan O'Sullivan <bos@lindenlab.com>2009-07-28 15:18:22 -0700
commiteb0a3c9960d53fde2cd618c9e46f5aaf77fd80d9 (patch)
treeab3618cb0608ce77db0e1be3b1fd6378ac7fa807
parent935712fc5b9f927208d5257fe6a3997bdea2d22a (diff)
parent91497c40c53f145749ae418c8f49e05916d87f5b (diff)
Merge
-rw-r--r--indra/newview/lllogininstance.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp
index c08cc2baae..16192079a2 100644
--- a/indra/newview/lllogininstance.cpp
+++ b/indra/newview/lllogininstance.cpp
@@ -450,4 +450,4 @@ std::string construct_start_string()
start = gSavedSettings.getString("LoginLocation");
}
return start;
-} \ No newline at end of file
+}