diff options
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index f03eb48573..d791c927a4 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -7065,6 +7065,10 @@ BOOL object_selected_and_point_valid() BOOL object_is_wearable() { + if (!isAgentAvatarValid()) + { + return FALSE; + } if (!object_selected_and_point_valid()) { return FALSE; @@ -7073,6 +7077,10 @@ BOOL object_is_wearable() { return FALSE; } + if (!gAgentAvatarp->canAttachMoreObjects()) + { + return FALSE; + } LLObjectSelectionHandle selection = LLSelectMgr::getInstance()->getSelection(); for (LLObjectSelection::valid_root_iterator iter = LLSelectMgr::getInstance()->getSelection()->valid_root_begin(); iter != LLSelectMgr::getInstance()->getSelection()->valid_root_end(); iter++) |