diff options
author | Logan Dethrow <log@lindenlab.com> | 2012-12-11 16:38:10 -0500 |
---|---|---|
committer | Logan Dethrow <log@lindenlab.com> | 2012-12-11 16:38:10 -0500 |
commit | 03025733484f7f1ea46d0356e65b0d142bc1dbdb (patch) | |
tree | d48902f9fab2fdc4d15850ffee3d6860f550bcb4 /indra/linux_updater/linux_updater.cpp | |
parent | edcdce226a7ff599e43c89fe7e4d37350650ae96 (diff) | |
parent | 798377b076fbce895ba2075417107de0da10b9ca (diff) |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-development
Diffstat (limited to 'indra/linux_updater/linux_updater.cpp')
-rw-r--r-- | indra/linux_updater/linux_updater.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/linux_updater/linux_updater.cpp b/indra/linux_updater/linux_updater.cpp index 991dfd9dce..86fa596aef 100644 --- a/indra/linux_updater/linux_updater.cpp +++ b/indra/linux_updater/linux_updater.cpp @@ -812,7 +812,6 @@ void parse_args_and_init(int argc, char **argv, UpdaterAppState *app_state) int main(int argc, char **argv) { UpdaterAppState* app_state = new UpdaterAppState; - GThread *worker_thread; parse_args_and_init(argc, argv, app_state); @@ -842,8 +841,7 @@ int main(int argc, char **argv) //llinfos << "SAMPLE TRANSLATION IS: " << LLTrans::getString("LoginInProgress") << llendl; // create download thread - worker_thread = g_thread_create - (GThreadFunc(worker_thread_cb), app_state, FALSE, NULL); + g_thread_create(GThreadFunc(worker_thread_cb), app_state, FALSE, NULL); gdk_threads_enter(); gtk_main(); |