diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-02-19 21:42:32 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-02-19 21:42:32 +0000 |
| commit | 2e32d44e7165775936beae5d9ef636ff9d3f2bd2 (patch) | |
| tree | 8153bc399994aabf6e1c41c2d8332e4e8c4ddb78 /indra/newview/llparcelselection.cpp | |
| parent | db0f5847ea8b96b3c1ac08e7aeb43d83daacb8e4 (diff) | |
merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release.
QAR-290 = QAR-271 + QAR-191
Diffstat (limited to 'indra/newview/llparcelselection.cpp')
| -rw-r--r-- | indra/newview/llparcelselection.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llparcelselection.cpp b/indra/newview/llparcelselection.cpp index 5478a96b97..e49ae57bcf 100644 --- a/indra/newview/llparcelselection.cpp +++ b/indra/newview/llparcelselection.cpp @@ -17,9 +17,8 @@ LLPointer<LLParcelSelection> LLParcelSelection::sNullSelection; template<> - const LLHandle<LLParcelSelection>::NullFunc - LLHandle<LLParcelSelection>::sNullFunc = - LLParcelSelection::getNullParcelSelection; + const LLSafeHandle<LLParcelSelection>::NullFunc + LLSafeHandle<LLParcelSelection>::sNullFunc = LLParcelSelection::getNullParcelSelection; // // LLParcelSelection |