diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-08-29 10:45:32 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-08-29 10:45:32 -0700 |
| commit | 01a154809d650f7905aaa208150a1070b19e5c2b (patch) | |
| tree | f0dda921e97830d68e41553137459a3dbcca07b6 /indra/newview/llnearbychat.cpp | |
| parent | ca7abc4c3be9310f4e5fec00b7d6ffadaba58ff0 (diff) | |
| parent | 051bc99573d7c571cea0e2e1df332c1e5e97ff19 (diff) | |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/llnearbychat.cpp')
| -rw-r--r-- | indra/newview/llnearbychat.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp index a723748094..f1518fe825 100644 --- a/indra/newview/llnearbychat.cpp +++ b/indra/newview/llnearbychat.cpp @@ -262,7 +262,7 @@ void LLNearbyChat::loadHistory() do_not_log["do_not_log"] = true; std::list<LLSD> history; - LLLogChat::loadAllHistory("chat", history); + LLLogChat::loadChatHistory("chat", history); std::list<LLSD>::const_iterator it = history.begin(); while (it != history.end()) |