diff --git a/doc/contributions.txt b/doc/contributions.txt
index 18acb189112a2829148e64eba3bd6c712fd0f431..db9558e9a2d9e0f2aafef8a08a68d11be58ba238 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -325,6 +325,7 @@ Cinder Roxley
     STORM-2036
     STORM-2037
     STORM-2053
+    STORM-2098
 Clara Young
 Coaldust Numbers
     VWR-1095
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 3abeba4b43301a0846f89ec988e0a0d6c67a2713..e190119bcd5c55210110ece1c12e5e552ad7bd5e 100755
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -2830,6 +2830,8 @@ BOOL enable_object_build(void*)
 
 bool enable_object_edit()
 {
+	if (!isAgentAvatarValid()) return false;
+	
 	// *HACK:  The new "prelude" Help Islands have a build sandbox area,
 	// so users need the Edit and Create pie menu options when they are
 	// there.  Eventually this needs to be replaced with code that only