diff options
author | Merov Linden <merov@lindenlab.com> | 2012-11-14 10:43:09 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2012-11-14 10:43:09 -0800 |
commit | a5d6375dd9faf5a39f0320ed31073e157534761a (patch) | |
tree | e09140fe51e18bdd05aff9d4ae0d3b581b9af5a6 /indra/newview/llconversationmodel.h | |
parent | e15921e42b4ac14504b22b0acbb349aa6d19664b (diff) | |
parent | 33068c6da8f079c557e4fb520b074f6e5ce40ba4 (diff) |
Merge
Diffstat (limited to 'indra/newview/llconversationmodel.h')
-rwxr-xr-x | indra/newview/llconversationmodel.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llconversationmodel.h b/indra/newview/llconversationmodel.h index 481d46af58..2ee21d0c16 100755 --- a/indra/newview/llconversationmodel.h +++ b/indra/newview/llconversationmodel.h @@ -195,6 +195,7 @@ public: virtual const bool getDistanceToAgent(F64& dist) const { dist = mDistToAgent; return (dist >= 0.0); } void fetchAvatarName(); + LLConversationItemSession* getParentSession(); void dumpDebugData(); |