diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-10-29 11:24:06 -0700 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-10-29 11:24:06 -0700 |
| commit | e777f9cbe6a10c7897fb6ba46fa300feae7831e7 (patch) | |
| tree | 88b304403137989d3da13cac35b69277115619fe /indra/newview/lllandmarkactions.cpp | |
| parent | c4992e30654775c54e3dc4fb583375ec079b23a4 (diff) | |
| parent | 64c2cb6ba1c089c15df6c8ef5ec5313ed5f1897f (diff) | |
Merge with remote repo
Diffstat (limited to 'indra/newview/lllandmarkactions.cpp')
| -rw-r--r-- | indra/newview/lllandmarkactions.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lllandmarkactions.cpp b/indra/newview/lllandmarkactions.cpp index b36b7cf50e..091346d3b4 100644 --- a/indra/newview/lllandmarkactions.cpp +++ b/indra/newview/lllandmarkactions.cpp @@ -348,7 +348,7 @@ LLLandmark* LLLandmarkActions::getLandmark(const LLUUID& landmarkInventoryItemID { LLViewerInventoryItem* item = gInventory.getItem(landmarkInventoryItemID); if (NULL == item) - return false; + return NULL; const LLUUID& asset_id = item->getAssetUUID(); return gLandmarkList.getAsset(asset_id, NULL); |