diff options
| author | simon <none@none> | 2013-11-25 09:17:29 -0800 |
|---|---|---|
| committer | simon <none@none> | 2013-11-25 09:17:29 -0800 |
| commit | 5756b7b3d05ce330e9877650ba6af04aaa4da49d (patch) | |
| tree | a1668748b931f0b0a9bd2df80aa24b1c156e8f9e /indra/newview/llvopartgroup.cpp | |
| parent | f1be57cd30489902e44d7843703a39987f379c69 (diff) | |
| parent | 1ae4d45337b380213112183f153a631d4c3f3289 (diff) | |
Merge - doh!
Diffstat (limited to 'indra/newview/llvopartgroup.cpp')
| -rwxr-xr-x | indra/newview/llvopartgroup.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvopartgroup.cpp b/indra/newview/llvopartgroup.cpp index 9f4f11b317..54e27ff4c6 100755 --- a/indra/newview/llvopartgroup.cpp +++ b/indra/newview/llvopartgroup.cpp @@ -200,7 +200,7 @@ void LLVOPartGroup::updateSpatialExtents(LLVector4a& newMin, LLVector4a& newMax) mDrawable->setPositionGroup(p); } -void LLVOPartGroup::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time) +void LLVOPartGroup::idleUpdate(LLAgent &agent, const F64 &time) { } |