diff options
author | callum <none@none> | 2009-10-22 15:35:14 -0700 |
---|---|---|
committer | callum <none@none> | 2009-10-22 15:35:14 -0700 |
commit | 35e8a7cae665ac42e94680e13fb267eb3a6e3cfb (patch) | |
tree | 204d51f94889440d7787e895e0e8b09832d2e0e4 /indra/newview/llviewerparcelmgr.cpp | |
parent | f7e4f1d1a505c0394d45e0dfd762620a62ffdafa (diff) | |
parent | aba9c25556e1a4477849fd81b81420c3e322e3f7 (diff) |
Merge my changes with rev. 2603
Diffstat (limited to 'indra/newview/llviewerparcelmgr.cpp')
-rw-r--r-- | indra/newview/llviewerparcelmgr.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index 44de848d19..77b023f6dd 100644 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -1162,10 +1162,11 @@ void LLViewerParcelMgr::sendParcelBuy(ParcelBuyInfo* info) msg->sendReliable(info->mHost); } -void LLViewerParcelMgr::deleteParcelBuy(ParcelBuyInfo*& info) +void LLViewerParcelMgr::deleteParcelBuy(ParcelBuyInfo* *info) { - delete info; - info = NULL; + // Must be here because ParcelBuyInfo is local to this .cpp file + delete *info; + *info = NULL; } void LLViewerParcelMgr::sendParcelDeed(const LLUUID& group_id) |