aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpreviewlandmark.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llpreviewlandmark.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/linden/indra/newview/llpreviewlandmark.cpp b/linden/indra/newview/llpreviewlandmark.cpp
index adb6db1..01d77f6 100644
--- a/linden/indra/newview/llpreviewlandmark.cpp
+++ b/linden/indra/newview/llpreviewlandmark.cpp
@@ -57,6 +57,7 @@
57#include "llviewerregion.h" 57#include "llviewerregion.h"
58#include "llviewerstats.h" 58#include "llviewerstats.h"
59#include "lluictrlfactory.h" 59#include "lluictrlfactory.h"
60#include "lltexturectrl.h"
60 61
61 62
62 63
@@ -137,14 +138,14 @@ void LLPreviewLandmark::getDegreesAndDist( F32* degrees, F64* horiz_dist, F64* v
137 } 138 }
138} 139}
139 140
140const LLString& LLPreviewLandmark::getName() const 141const std::string& LLPreviewLandmark::getName() const
141{ 142{
142 const LLInventoryItem *item = getItem(); 143 const LLInventoryItem *item = getItem();
143 if (item) 144 if (item)
144 { 145 {
145 return item->getName(); 146 return item->getName();
146 } 147 }
147 return LLString::null; 148 return LLStringUtil::null;
148} 149}
149 150
150LLVector3d LLPreviewLandmark::getPositionGlobal() const 151LLVector3d LLPreviewLandmark::getPositionGlobal() const