summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-04-14 10:18:13 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-04-14 10:18:13 +0100
commit168ef83bcfae2a03c385a91a70e12a6fc773e3c5 (patch)
tree47c634a7ed0d6b4ec8ed7711bbc4cf880f7daaba /indra/newview/llstartup.cpp
parentf480e1e8fc8d5e7f0c10eec26e03430e5aed8eaa (diff)
parent8dd62863092b10e012db20e818e72b53fd2ed84a (diff)
slightly hairy merge from viewer-trunk
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r--indra/newview/llstartup.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index c7eb9320e4..27b8ff0628 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -1770,7 +1770,8 @@ bool idle_startup()
}
}
// no need to add gesture to inventory observer, it's already made in constructor
- LLGestureMgr::instance().fetch(item_ids);
+ LLGestureMgr::instance().setFetchIDs(item_ids);
+ LLGestureMgr::instance().startFetch();
}
}
gDisplaySwapBuffers = TRUE;