aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lltoolpie.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/lltoolpie.cpp')
-rw-r--r--linden/indra/newview/lltoolpie.cpp7
1 files changed, 0 insertions, 7 deletions
diff --git a/linden/indra/newview/lltoolpie.cpp b/linden/indra/newview/lltoolpie.cpp
index 7cab0eb..429b9d4 100644
--- a/linden/indra/newview/lltoolpie.cpp
+++ b/linden/indra/newview/lltoolpie.cpp
@@ -394,13 +394,6 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
394 object = (LLViewerObject*)object->getParent(); 394 object = (LLViewerObject*)object->getParent();
395 } 395 }
396 396
397// From singularity commit 080407d92f2846397472be1ab533a9da7f8b66cb by Shyotl.
398// TODO: Is THIS what is causing HUD monsters to cause crashes?
399 if (!object)
400 {
401 return TRUE; // unexpected, but escape
402 }
403
404 // Object is an avatar, so check for mute by id. 397 // Object is an avatar, so check for mute by id.
405 LLVOAvatar* avatar = (LLVOAvatar*)object; 398 LLVOAvatar* avatar = (LLVOAvatar*)object;
406 std::string name = avatar->getFullname(); 399 std::string name = avatar->getFullname();