diff options
| author | Kyle Machulis <qdot@lindenlab.com> | 2007-11-20 23:42:48 +0000 |
|---|---|---|
| committer | Kyle Machulis <qdot@lindenlab.com> | 2007-11-20 23:42:48 +0000 |
| commit | 2e7c0d973ed28d732ea19762099ed3c55123780e (patch) | |
| tree | 36b04301d325e07075880a8a64166c5284d1d61f /indra/newview/llworld.h | |
| parent | 5356b917545d43df5537128245ee5b786b705b90 (diff) | |
svn merge -r74104:74124 svn+ssh://svn/svn/linden/branches/crash-logger-cleanup-merge-6
Diffstat (limited to 'indra/newview/llworld.h')
| -rw-r--r-- | indra/newview/llworld.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llworld.h b/indra/newview/llworld.h index 91685cd297..e634459acd 100644 --- a/indra/newview/llworld.h +++ b/indra/newview/llworld.h @@ -142,7 +142,7 @@ public: void setSpaceTimeUSec(const U64 space_time_usec); U64 getSpaceTimeUSec() const; - LLString getInfoString(); + void getInfo(LLSD& info); public: typedef std::list<LLViewerRegion*> region_list_t; |