diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-03-09 22:55:16 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-03-09 22:55:16 +0000 |
| commit | cf405184285c25723249d5a023b28d9498cf0c3f (patch) | |
| tree | c4f16cbd5eecf5ad14ebf73800c9a38048c49c18 /indra/newview/llviewermenu.cpp | |
| parent | b36dc363061ec5bf6b092c14193198e9a5eef816 (diff) | |
merge -r 58986:59028 maintenance
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 64560efd67..9ac566b02b 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -6096,7 +6096,7 @@ void complete_give_money(S32 option, void* user_data) LLObjectSelectionHandle handle(*(LLObjectSelectionHandle*)user_data); delete (LLObjectSelectionHandle*)user_data; - LLViewerObject *objectp = handle->getFirstRootObject(); + LLViewerObject* objectp = handle->getPrimaryObject(); // Show avatar's name if paying attachment if (objectp && objectp->isAttachment()) |