summaryrefslogtreecommitdiff
path: root/indra/linux_updater/linux_updater.cpp
diff options
context:
space:
mode:
authorTank_Master <tank.master@phoenixviewer.com>2014-01-18 10:56:00 -0800
committerTank_Master <tank.master@phoenixviewer.com>2014-01-18 10:56:00 -0800
commit091185b057d312e05f6b7ec7d03a37dec0879adf (patch)
tree48d4d4b4d3c1b02e40f9b029cf65bb200687f087 /indra/linux_updater/linux_updater.cpp
parenta0ac409e8a4a822a55e9079b4a6d947af5edf220 (diff)
parentd8a81b240e828a8ab27709fb11038a4b5c4d5428 (diff)
Merge
Diffstat (limited to 'indra/linux_updater/linux_updater.cpp')
-rw-r--r--indra/linux_updater/linux_updater.cpp4
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();