aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lldelayedgestureerror.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-09-06 18:24:57 -0500
committerJacek Antonelli2008-09-06 18:25:07 -0500
commit798d367d54a6c6379ad355bd8345fa40e31e7fe9 (patch)
tree1921f1708cd0240648c97bc02df2c2ab5f2fc41e /linden/indra/newview/lldelayedgestureerror.cpp
parentSecond Life viewer sources 1.20.15 (diff)
downloadmeta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.zip
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.gz
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.bz2
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.xz
Second Life viewer sources 1.21.0-RC
Diffstat (limited to 'linden/indra/newview/lldelayedgestureerror.cpp')
-rw-r--r--linden/indra/newview/lldelayedgestureerror.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/lldelayedgestureerror.cpp b/linden/indra/newview/lldelayedgestureerror.cpp
index 0a1c9df..6c7f967 100644
--- a/linden/indra/newview/lldelayedgestureerror.cpp
+++ b/linden/indra/newview/lldelayedgestureerror.cpp
@@ -98,7 +98,7 @@ void LLDelayedGestureError::onIdle(void *userdata)
98//static 98//static
99bool LLDelayedGestureError::doDialog(const LLErrorEntry &ent, bool uuid_ok) 99bool LLDelayedGestureError::doDialog(const LLErrorEntry &ent, bool uuid_ok)
100{ 100{
101 LLStringBase<char>::format_map_t args; 101 LLStringUtil::format_map_t args;
102 LLInventoryItem *item = gInventory.getItem( ent.mItemID ); 102 LLInventoryItem *item = gInventory.getItem( ent.mItemID );
103 103
104 if ( item ) 104 if ( item )
@@ -109,7 +109,7 @@ bool LLDelayedGestureError::doDialog(const LLErrorEntry &ent, bool uuid_ok)
109 { 109 {
110 if ( uuid_ok || ent.mTimer.getElapsedTimeF32() > MAX_NAME_WAIT_TIME ) 110 if ( uuid_ok || ent.mTimer.getElapsedTimeF32() > MAX_NAME_WAIT_TIME )
111 { 111 {
112 args["[NAME]"] = LLString( ent.mItemID.asString() ); 112 args["[NAME]"] = std::string( ent.mItemID.asString() );
113 } 113 }
114 else 114 else
115 { 115 {