2 files changed, 10 insertions, 2 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index b6b9739..6a71bcc 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -16,6 +16,13 @@
         Bumped version to 1.1.0 alpha.
 
 
+2008-12-11  McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * linden/indra/newview/llfloaterinspect.cpp:
+        VWR-10823: Right click > Inspect crashes viewer.
+        Backported from LL's 1.22 RC3.
+
+
 2008-11-24  McCabe Maxsted  <hakushakukun@gmail.com>
 
         * linden/indra/newview/llfloatergroupinvite.cpp:
diff --git a/linden/indra/newview/llfloaterinspect.cpp b/linden/indra/newview/llfloaterinspect.cpp
index d308210..8a665b5 100644
--- a/linden/indra/newview/llfloaterinspect.cpp
+++ b/linden/indra/newview/llfloaterinspect.cpp
@@ -206,8 +206,9 @@ void LLFloaterInspect::refresh()
         mObjectList->operateOnAll(LLScrollListCtrl::OP_DELETE);
         //List all transient objects, then all linked objects
 
-        for (LLObjectSelection::iterator iter = mObjectSelection->begin();
-                 iter != mObjectSelection->end(); iter++)
+        //Crash fix for VWR-10823
+        for (LLObjectSelection::valid_iterator iter = mObjectSelection->valid_begin(); 
+                                iter != mObjectSelection->valid_end(); iter++) 
         {
                 LLSelectNode* obj = *iter;
                 LLSD row;