CHOP-763: Introduce static LLView::getPathname(LLView*).

Use it for LLWindowListener to safely report an LLView* which might be NULL.

1 files changed, 16 insertions, 11 deletions

diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 0c8e3bace4..77abb1c6bf 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -433,20 +433,15 @@ BOOL LLView::isInEnabledChain() const
 
 static void buildPathname(std::ostream& out, const LLView* view)
 {
-	if (view == 0) return;
-
-	if (view->getParent() != 0)
+	if (! (view && view->getParent()))
 	{
-		buildPathname(out, view->getParent());
-
-		// Build pathname into ostream on the way back from recursion.
-		out << '/' << view->getName();
-	}
-	else 
-	{
-		; // Don't include root in the path.
+		return; // Don't include root in the path.
 	}
 
+	buildPathname(out, view->getParent());
+
+	// Build pathname into ostream on the way back from recursion.
+	out << '/' << view->getName();
 }
 
 std::string LLView::getPathname() const
@@ -456,6 +451,16 @@ std::string LLView::getPathname() const
 	return out.str();
 }
 
+//static
+std::string LLView::getPathname(const LLView* view)
+{
+    if (! view)
+    {
+        return "NULL";
+    }
+    return view->getPathname();
+}
+
 // virtual
 BOOL LLView::canFocusChildren() const
 {