diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/groupchatlistener.cpp | 10 | ||||
| -rw-r--r-- | indra/newview/llfloatereditsky.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llfloatereditwater.cpp | 2 | 
3 files changed, 7 insertions, 7 deletions
| diff --git a/indra/newview/groupchatlistener.cpp b/indra/newview/groupchatlistener.cpp index ef015a950d..a05caa961b 100644 --- a/indra/newview/groupchatlistener.cpp +++ b/indra/newview/groupchatlistener.cpp @@ -64,11 +64,11 @@ GroupChatListener::GroupChatListener():          "Leave a group chat in group with UUID [\"id\"]\n"          "Assumes a prior successful startIM request.",          &LLGroupActions::endIM, -        LLSDArray("id")); -	add("sendIM", -		"send a groupchat IM", -		&send_message_wrapper, -        LLSDArray("text")("session_id")("group_id")); +        llsd::array("id")); +    add("sendIM", +        "send a groupchat IM", +        &send_message_wrapper, +        llsd::array("text", "session_id", "group_id"));  }  /*  	static void sendMessage(const std::string& utf8_text, const LLUUID& im_session_id, diff --git a/indra/newview/llfloatereditsky.cpp b/indra/newview/llfloatereditsky.cpp index 6bdc5ee823..2d5e86869d 100644 --- a/indra/newview/llfloatereditsky.cpp +++ b/indra/newview/llfloatereditsky.cpp @@ -523,7 +523,7 @@ void LLFloaterEditSky::refreshSkyPresetsList()      for (LLEnvironment::list_name_id_t::iterator it = list.begin(); it != list.end(); ++it)      { -        mSkyPresetCombo->add((*it).first, LLSDArray((*it).first)((*it).second)); +        mSkyPresetCombo->add((*it).first, llsd::array((*it).first, (*it).second));      }  	mSkyPresetCombo->setLabel(getString("combo_label")); diff --git a/indra/newview/llfloatereditwater.cpp b/indra/newview/llfloatereditwater.cpp index 6e7b777e70..c44ae7faca 100644 --- a/indra/newview/llfloatereditwater.cpp +++ b/indra/newview/llfloatereditwater.cpp @@ -335,7 +335,7 @@ void LLFloaterEditWater::refreshWaterPresetsList()      for (LLEnvironment::list_name_id_t::iterator it = list.begin(); it != list.end(); ++it)      { -        mWaterPresetCombo->add((*it).first, LLSDArray((*it).first)((*it).second)); +        mWaterPresetCombo->add((*it).first, llsd::array((*it).first, (*it).second));      }  	mWaterPresetCombo->setLabel(getString("combo_label")); | 
