diff options
Diffstat (limited to 'linden/indra/newview/llfloaterinspect.cpp')
-rw-r--r-- | linden/indra/newview/llfloaterinspect.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/linden/indra/newview/llfloaterinspect.cpp b/linden/indra/newview/llfloaterinspect.cpp index 8a665b5..e1d3c4a 100644 --- a/linden/indra/newview/llfloaterinspect.cpp +++ b/linden/indra/newview/llfloaterinspect.cpp | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2006&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2006&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2006-2008, Linden Research, Inc. | 7 | * Copyright (c) 2006-2009, Linden Research, Inc. |
8 | * | 8 | * |
9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
@@ -206,14 +206,19 @@ void LLFloaterInspect::refresh() | |||
206 | mObjectList->operateOnAll(LLScrollListCtrl::OP_DELETE); | 206 | mObjectList->operateOnAll(LLScrollListCtrl::OP_DELETE); |
207 | //List all transient objects, then all linked objects | 207 | //List all transient objects, then all linked objects |
208 | 208 | ||
209 | //Crash fix for VWR-10823 | 209 | for (LLObjectSelection::valid_iterator iter = mObjectSelection->valid_begin(); |
210 | for (LLObjectSelection::valid_iterator iter = mObjectSelection->valid_begin(); | 210 | iter != mObjectSelection->valid_end(); iter++) |
211 | iter != mObjectSelection->valid_end(); iter++) | ||
212 | { | 211 | { |
213 | LLSelectNode* obj = *iter; | 212 | LLSelectNode* obj = *iter; |
214 | LLSD row; | 213 | LLSD row; |
215 | char time[MAX_STRING]; | 214 | char time[MAX_STRING]; |
216 | std::string owner_name, creator_name; | 215 | std::string owner_name, creator_name; |
216 | |||
217 | if (obj->mCreationDate == 0) | ||
218 | { // Don't have valid information from the server, so skip this one | ||
219 | continue; | ||
220 | } | ||
221 | |||
217 | time_t timestamp = (time_t) (obj->mCreationDate/1000000); | 222 | time_t timestamp = (time_t) (obj->mCreationDate/1000000); |
218 | LLStringUtil::copy(time, ctime(×tamp), MAX_STRING); | 223 | LLStringUtil::copy(time, ctime(×tamp), MAX_STRING); |
219 | time[24] = '\0'; | 224 | time[24] = '\0'; |