diff --git a/indra/llmessage/llcurl.cpp b/indra/llmessage/llcurl.cpp index f7fde67be..be35e97f4 100644 --- a/indra/llmessage/llcurl.cpp +++ b/indra/llmessage/llcurl.cpp @@ -291,7 +291,9 @@ LLCurl::Easy* LLCurl::Easy::getEasy() // set no DNS caching as default for all easy handles. This prevents them adopting a // multi handles cache if they are added to one. - CURLcode result = curl_easy_setopt(easy->mCurlEasyHandle, CURLOPT_DNS_CACHE_TIMEOUT, 0); + CURLcode result = curl_easy_setopt(easy->mCurlEasyHandle, CURLOPT_DNS_CACHE_TIMEOUT, 10); + check_curl_code(result); + result = curl_easy_setopt(easy->mCurlEasyHandle, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4); check_curl_code(result); // Disable SSL/TLS session caching. Some servers refuse to talk to us when session ids are enabled. @@ -479,6 +481,8 @@ void LLCurl::Easy::prepRequest(const std::string& url, //setopt(CURLOPT_VERBOSE, 1); // useful for debugging setopt(CURLOPT_NOSIGNAL, 1); + setopt(CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4); + // Set the CURL options for either Socks or HTTP proxy LLProxy::getInstance()->applyProxySettings(this); diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp index f10e211f1..12906fd92 100644 --- a/indra/llui/llbutton.cpp +++ b/indra/llui/llbutton.cpp @@ -1063,11 +1063,13 @@ void LLButton::setImageOverlay(const std::string& image_name, LLFontGL::HAlign a if (image_name.empty()) { mImageOverlay = NULL; + mImageOverlaySelectedColor = LLColor4::white; } else { mImageOverlay = LLUI::getUIImage(image_name); mImageOverlayAlignment = alignment; + mImageOverlaySelectedColor = color; mImageOverlayColor = color; } } @@ -1077,11 +1079,13 @@ void LLButton::setImageOverlay(const LLUUID& image_id, LLFontGL::HAlign alignmen if (image_id.isNull()) { mImageOverlay = NULL; + mImageOverlaySelectedColor = LLColor4::white; } else { mImageOverlay = LLUI::getUIImageByID(image_id); mImageOverlayAlignment = alignment; + mImageOverlaySelectedColor = color; mImageOverlayColor = color; } } diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 6b1ffbdfd..37054235e 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -219,19 +219,20 @@ const F32 OFFER_THROTTLE_TIME=10.f; //time period in seconds //script permissions const std::string SCRIPT_QUESTIONS[SCRIPT_PERMISSION_EOF] = - { - "ScriptTakeMoney", - "ActOnControlInputs", - "RemapControlInputs", - "AnimateYourAvatar", - "AttachToYourAvatar", - "ReleaseOwnership", - "LinkAndDelink", - "AddAndRemoveJoints", - "ChangePermissions", - "TrackYourCamera", - "ControlYourCamera" - }; +{ + "ScriptTakeMoney", + "ActOnControlInputs", + "RemapControlInputs", + "AnimateYourAvatar", + "AttachToYourAvatar", + "ReleaseOwnership", + "LinkAndDelink", + "AddAndRemoveJoints", + "ChangePermissions", + "TrackYourCamera", + "ControlYourCamera", + "TeleportYourAgent" +}; const BOOL SCRIPT_QUESTION_IS_CAUTION[SCRIPT_PERMISSION_EOF] = { @@ -245,7 +246,8 @@ const BOOL SCRIPT_QUESTION_IS_CAUTION[SCRIPT_PERMISSION_EOF] = FALSE, // AddAndRemoveJoints FALSE, // ChangePermissions FALSE, // TrackYourCamera, - FALSE // ControlYourCamera + FALSE, // ControlYourCamera + FALSE // TeleportYourAgent }; bool friendship_offer_callback(const LLSD& notification, const LLSD& response) diff --git a/indra/newview/skins/default/xui/en-us/floater_chat_history.xml b/indra/newview/skins/default/xui/en-us/floater_chat_history.xml index 01f46d607..1afed9c2f 100644 --- a/indra/newview/skins/default/xui/en-us/floater_chat_history.xml +++ b/indra/newview/skins/default/xui/en-us/floater_chat_history.xml @@ -20,6 +20,7 @@ Add and remove joints with other objects Change its permissions Track your camera + Teleport you Control your camera diff --git a/indra/newview/skins/default/xui/es/floater_chat_history.xml b/indra/newview/skins/default/xui/es/floater_chat_history.xml index 06f4c9207..50f8bc962 100644 --- a/indra/newview/skins/default/xui/es/floater_chat_history.xml +++ b/indra/newview/skins/default/xui/es/floater_chat_history.xml @@ -60,6 +60,9 @@ Controlar tu cámara + + Teleportarte + diff --git a/indra/newview/skins/default/xui/es/floater_display_name.xml b/indra/newview/skins/default/xui/es/floater_display_name.xml index 74a052e9c..26e4139d2 100644 --- a/indra/newview/skins/default/xui/es/floater_display_name.xml +++ b/indra/newview/skins/default/xui/es/floater_display_name.xml @@ -14,9 +14,9 @@