diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-11-15 14:32:18 -0800 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-11-15 14:32:18 -0800 |
| commit | ba1fbddc2dbc526ee89e7d79b35cf3e0a46e3add (patch) | |
| tree | d779020d73e73a8eb9fa8731c362b8708c8837ef /indra/newview/llviewerwindow.cpp | |
| parent | 2783783575a9b712eb318b450dc5e6bb17d7f7c5 (diff) | |
| parent | a0a1d93fb6a74149bbef57f1d1489510247110ca (diff) | |
Merge 6ish
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 01ec703fe6..e53ccd7b8d 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -543,7 +543,14 @@ public: object_count++; S32 bytes = 0; S32 visible = 0; - cost += object->getStreamingCost(&bytes, &visible); + cost += object->getStreamingCost(); + LLMeshCostData costs; + if (object->getCostData(costs)) + { + bytes = costs.getSizeTotal(); + visible = costs.getSizeByLOD(object->getLOD()); + } + S32 vt = 0; count += object->getTriangleCount(&vt); vcount += vt; @@ -1146,7 +1153,9 @@ LLWindowCallbacks::DragNDropResult LLViewerWindow::handleDragNDrop( LLWindow *wi if (prim_media_dnd_enabled) { - LLPickInfo pick_info = pickImmediate( pos.mX, pos.mY, TRUE /*BOOL pick_transparent*/, FALSE ); + LLPickInfo pick_info = pickImmediate( pos.mX, pos.mY, + TRUE /* pick_transparent */, + FALSE /* pick_rigged */); LLUUID object_id = pick_info.getObjectID(); S32 object_face = pick_info.mObjectFace; |