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/llviewerobjectlist.h | |
| parent | f1be57cd30489902e44d7843703a39987f379c69 (diff) | |
| parent | 1ae4d45337b380213112183f153a631d4c3f3289 (diff) | |
Merge - doh!
Diffstat (limited to 'indra/newview/llviewerobjectlist.h')
| -rwxr-xr-x | indra/newview/llviewerobjectlist.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerobjectlist.h b/indra/newview/llviewerobjectlist.h index 6518c25d09..98b50fa789 100755 --- a/indra/newview/llviewerobjectlist.h +++ b/indra/newview/llviewerobjectlist.h @@ -83,7 +83,7 @@ public: void processCompressedObjectUpdate(LLMessageSystem *mesgsys, void **user_data, EObjectUpdateType update_type); void processCachedObjectUpdate(LLMessageSystem *mesgsys, void **user_data, EObjectUpdateType update_type); void updateApparentAngles(LLAgent &agent); - void update(LLAgent &agent, LLWorld &world); + void update(LLAgent &agent); void fetchObjectCosts(); void fetchPhysicsFlags(); |