diff options
| author | rider <rider@lindenlab.com> | 2015-10-01 12:36:52 -0700 |
|---|---|---|
| committer | rider <rider@lindenlab.com> | 2015-10-01 12:36:52 -0700 |
| commit | ca81b19e80d0e0301b08bad9bd32ada937dea10d (patch) | |
| tree | 86e33382a19aa9b9f1555b8987a1a6b511b8cbe5 /indra/newview/llpanelexperiencelog.cpp | |
| parent | 17ff449ae6b2759f212daa4fd3de0a7ea2664866 (diff) | |
| parent | 4334fd27e2215c1bfad3aa7ab7130b8c6b289de5 (diff) | |
Merge for Xcode 7
Diffstat (limited to 'indra/newview/llpanelexperiencelog.cpp')
| -rw-r--r-- | indra/newview/llpanelexperiencelog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelexperiencelog.cpp b/indra/newview/llpanelexperiencelog.cpp index df03ef7526..d5979b6e96 100644 --- a/indra/newview/llpanelexperiencelog.cpp +++ b/indra/newview/llpanelexperiencelog.cpp @@ -140,7 +140,7 @@ void LLPanelExperienceLog::refresh() } const LLSD event = dayArray[i]; LLUUID id = event[LLExperienceCache::EXPERIENCE_ID].asUUID(); - const LLSD& experience = LLExperienceCache::get(id); + const LLSD& experience = LLExperienceCache::instance().get(id); if(experience.isUndefined()){ waiting = true; waiting_id = id; @@ -168,7 +168,7 @@ void LLPanelExperienceLog::refresh() { mEventList->deleteAllItems(); mEventList->setCommentText(getString("loading")); - LLExperienceCache::get(waiting_id, boost::bind(&LLPanelExperienceLog::refresh, this)); + LLExperienceCache::instance().get(waiting_id, boost::bind(&LLPanelExperienceLog::refresh, this)); } else { |