diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-06-30 15:57:14 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-06-30 15:57:14 -0400 |
| commit | 1716b8428f88989b2b8898e27cc137e7746a4805 (patch) | |
| tree | 2a488249a8618ec6aa406e140637701d6fa98f87 /indra/newview/llfloatermodelpreview.cpp | |
| parent | 06b1202747c07409c877cb89432f0df0bfacba47 (diff) | |
| parent | 17060f4e92b12ab74a1b570cd9ee4d1543fb23d1 (diff) | |
Automated merge with https://bitbucket.org/seth_productengine/mesh-development
Diffstat (limited to 'indra/newview/llfloatermodelpreview.cpp')
| -rwxr-xr-x | indra/newview/llfloatermodelpreview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index 7587cf0459..a79f3404cb 100755 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -575,7 +575,7 @@ void LLFloaterModelPreview::onClickCalculateBtn() LLMeshUploadThread* thread = new LLMeshUploadThread(mModelPreview->mUploadData, mModelPreview->mPreviewScale, childGetValue("upload_textures").asBoolean(), upload_skinweights, upload_joint_positions, mUploadModelUrl, false); - thread->setObserverHandle(getWholeModelFeeObserverHandle()); + thread->setFeeObserverHandle(getWholeModelFeeObserverHandle()); gMeshRepo.mUploadWaitList.push_back(thread); |