diff --git a/indra/llcommon/lluri.cpp b/indra/llcommon/lluri.cpp
index 447879ef24..be6edd8b7c 100644
--- a/indra/llcommon/lluri.cpp
+++ b/indra/llcommon/lluri.cpp
@@ -360,7 +360,7 @@ static BOOL isDefault(const std::string& scheme, U16 port)
void LLURI::parseAuthorityAndPathUsingOpaque()
{
- if (mScheme == "http" || mScheme == "https" || mScheme == "hop" || mScheme == "inworldz" || mScheme == "iw" ||
+ if (mScheme == "http" || mScheme == "https" || mScheme == "hop" ||
mScheme == "ftp" || mScheme == "secondlife" ||
mScheme == "x-grid-location-info")
{
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index fd6b72f65f..0d8f3be6d4 100644
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -42,7 +42,7 @@
// hop:// protocol>
//#define APP_HEADER_REGEX "((x-grid-location-info://[-\\w\\.]+/app)|(secondlife:///app))"
-#define APP_HEADER_REGEX "(((hop|x-grid-location-info)://[-\\w\\.\\:\\@]+/app)|((hop|secondlife|inworldz|iw):///app))"
+#define APP_HEADER_REGEX "(((hop|x-grid-location-info)://[-\\w\\.\\:\\@]+/app)|((hop|secondlife):///app))"
//
// Utility functions
@@ -354,9 +354,8 @@ std::string LLUrlEntryHTTPNoProtocol::getTooltip(const std::string &url) const
LLUrlEntryInvalidSLURL::LLUrlEntryInvalidSLURL()
: LLUrlEntryBase()
{
- // Inworldz special
- //mPattern = boost::regex("(http://(maps.secondlife.com|slurl.com)/secondlife/|secondlife://(/app/(worldmap|teleport)/)?)[^ /]+(/-?[0-9]+){1,3}(/?(\\?title|\\?img|\\?msg)=\\S*)?/?",
- mPattern = boost::regex("(https?://(maps.secondlife.com|slurl.com)/secondlife/|(secondlife|inworldz|iw)://(/app/(worldmap|teleport)/)?)[^ /]+(/-?[0-9]+){1,3}(/?(\\?title|\\?img|\\?msg)=\\S*)?/?",
+ // remove legacy Inworldz URI support. restore previous with addition of https
+ mPattern = boost::regex("(https?://(maps.secondlife.com|slurl.com)/secondlife/|secondlife://(/app/(worldmap|teleport)/)?)[^ /]+(/-?[0-9]+){1,3}(/?(\\?title|\\?img|\\?msg)=\\S*)?/?",
boost::regex::perl|boost::regex::icase);
mMenuName = "menu_url_http.xml";
mTooltip = LLTrans::getString("TooltipHttpUrl");
@@ -1099,7 +1098,7 @@ LLUrlEntryObjectIM::LLUrlEntryObjectIM()
{
// hop:// protocol; Ansa: Stop at first space so we can use it in notifications!
//mPattern = boost::regex("secondlife:///app/objectim/[\\da-f-]+\?\\S*\\w",
- mPattern = boost::regex("(hop|secondlife|inworldz|iw):///app/objectim/[\\da-f-]+\?[^ \t\r\n\v\f]*",
+ mPattern = boost::regex("(hop|secondlife):///app/objectim/[\\da-f-]+\?[^ \t\r\n\v\f]*",
//
boost::regex::perl|boost::regex::icase);
mMenuName = "menu_url_objectim.xml";
@@ -1228,9 +1227,7 @@ void LLUrlEntryParcel::processParcelInfo(const LLParcelData& parcel_data)
//
LLUrlEntryPlace::LLUrlEntryPlace()
{
- // Inworldz special
- //mPattern = boost::regex("((hop://[-\\w\\.\\:\\@]+/)|((x-grid-location-info://[-\\w\\.]+/region/)|(secondlife://)))\\S+/?(\\d+/\\d+/\\d+|\\d+/\\d+)/?", //
- mPattern = boost::regex("((hop://[-\\w\\.\\:\\@]+/)|((x-grid-location-info://[-\\w\\.]+/region/)|((secondlife|inworldz|iw)://)))\\S+/?(\\d+/\\d+/\\d+|\\d+/\\d+)/?", //
+ mPattern = boost::regex("((hop://[-\\w\\.\\:\\@]+/)|((x-grid-location-info://[-\\w\\.]+/region/)|(secondlife://)))\\S+/?(\\d+/\\d+/\\d+|\\d+/\\d+)/?", //
boost::regex::perl|boost::regex::icase);
mMenuName = "menu_url_slurl.xml";
mTooltip = LLTrans::getString("TooltipSLURL");
@@ -1413,7 +1410,7 @@ std::string LLUrlEntryTeleport::getLocation(const std::string &url) const
///
FSUrlEntryWear::FSUrlEntryWear()
{
- mPattern = boost::regex("(hop|secondlife|inworldz|iw):///app/wear_folder/\\S+",
+ mPattern = boost::regex("(hop|secondlife):///app/wear_folder/\\S+",
boost::regex::perl|boost::regex::icase);
mMenuName = "menu_url_slapp.xml";
mTooltip = LLTrans::getString("TooltipFSUrlEntryWear");
@@ -1431,7 +1428,7 @@ std::string FSUrlEntryWear::getLabel(const std::string &url, const LLUrlLabelCal
//
LLUrlEntrySL::LLUrlEntrySL()
{
- mPattern = boost::regex("(hop|secondlife|inworldz|iw)://(\\w+)?(:\\d+)?/\\S+", //
+ mPattern = boost::regex("(hop|secondlife)://(\\w+)?(:\\d+)?/\\S+", //
boost::regex::perl|boost::regex::icase);
mMenuName = "menu_url_slapp.xml";
mTooltip = LLTrans::getString("TooltipSLAPP");
@@ -1449,7 +1446,7 @@ std::string LLUrlEntrySL::getLabel(const std::string &url, const LLUrlLabelCallb
///
FSHelpDebugUrlEntrySL::FSHelpDebugUrlEntrySL()
{
- mPattern = boost::regex("(hop|secondlife|inworldz|iw):///app/fshelp/showdebug/\\S+",
+ mPattern = boost::regex("(hop|secondlife):///app/fshelp/showdebug/\\S+",
boost::regex::perl|boost::regex::icase);
mMenuName = "menu_url_slapp.xml";
mTooltip = LLTrans::getString("TooltipFSHelpDebugSLUrl");
@@ -1468,7 +1465,7 @@ std::string FSHelpDebugUrlEntrySL::getLabel(const std::string &url, const LLUrlL
//
LLUrlEntrySLLabel::LLUrlEntrySLLabel()
{
- mPattern = boost::regex("\\[(hop|secondlife|inworldz|iw)://\\S+[ \t]+[^\\]]+\\]", //
+ mPattern = boost::regex("\\[(hop|secondlife)://\\S+[ \t]+[^\\]]+\\]", //
boost::regex::perl|boost::regex::icase);
mMenuName = "menu_url_slapp.xml";
mTooltip = LLTrans::getString("TooltipSLAPP");
diff --git a/indra/newview/fsgridhandler.cpp b/indra/newview/fsgridhandler.cpp
index 24efda1337..aa5e69fa5b 100644
--- a/indra/newview/fsgridhandler.cpp
+++ b/indra/newview/fsgridhandler.cpp
@@ -1385,10 +1385,6 @@ std::string LLGridManager::getAppSLURLBase(const std::string& grid)
{
ret = mGridList[grid][GRID_APP_SLURL_BASE].asString();
}
- else if (grid == INWORLDZ_URI)
- {
- ret = "inworldz:///app";
- }
else
{
std::string app_base;
diff --git a/indra/newview/fsslurl.cpp b/indra/newview/fsslurl.cpp
index 22ff350b22..be5a5b5d43 100644
--- a/indra/newview/fsslurl.cpp
+++ b/indra/newview/fsslurl.cpp
@@ -59,11 +59,6 @@ const char* LLSLURL::SLURL_REGION_PATH = "region";
const char* LLSLURL::SIM_LOCATION_HOME = "home";
const char* LLSLURL::SIM_LOCATION_LAST = "last";
-// Inworldz special
-const char* LLSLURL::SLURL_INWORLDZ_SCHEME = "inworldz";
-const char* LLSLURL::SLURL_IW_SCHEME = "iw";
-const char* LLSLURL::PLACES_INWORLDZ_COM = "places.inworldz.com";
-
// resolve a simstring from a slurl
LLSLURL::LLSLURL(const std::string& slurl)
: mHypergrid(false)
@@ -244,55 +239,6 @@ LLSLURL::LLSLURL(const std::string& slurl)
path_array.insert(0, slurl_uri.hostNameAndPort());
}
}
- else if (slurl_uri.scheme() == LLSLURL::SLURL_INWORLDZ_SCHEME ||
- slurl_uri.scheme() == LLSLURL::SLURL_IW_SCHEME)
- {
- LL_DEBUGS("SLURL") << "inworldz scheme" << LL_ENDL;
-
- mGrid = INWORLDZ_URI;
-
- if (path_array[0].asString() == LLSLURL::SLURL_APP_PATH)
- {
- // it's in the form iw:///(app)
- // so parse the grid name to derive the grid ID
- if (!slurl_uri.hostNameAndPort().empty())
- {
- LL_DEBUGS("SLURL") << "(inworldz|iw):///app" << LL_ENDL;
-
- mGrid = LLGridManager::getInstance()->getGridByProbing(slurl_uri.hostNameAndPort());
- if (mGrid.empty())
- {
- mGrid = LLGridManager::getInstance()->getGridByProbing(slurl_uri.hostName());
- }
- }
- else if (path_array[0].asString() == LLSLURL::SLURL_APP_PATH)
- {
- LL_DEBUGS("SLURL") << "(inworldz|iw):///app" << LL_ENDL;
-
- // for app style slurls, where no grid name is specified, assume the currently
- // selected or logged in grid.
- mGrid = LLGridManager::getInstance()->getGridId();
- }
-
- if (mGrid.empty() && LLStartUp::getStartupState() == STATE_STARTED)
- {
- // we couldn't find the grid in the grid manager, so bail
- LL_WARNS("SLURL")<<"unable to find grid"< or /app/, so it must be iw://
- // therefore the hostname will be the region name, and it's a location type
- mType = LOCATION;
- // 'normalize' it so the region name is in fact the head of the path_array
- path_array.insert(0, slurl_uri.hostName());
- }
- }
else if((slurl_uri.scheme() == LLSLURL::SLURL_HTTP_SCHEME)
|| (slurl_uri.scheme() == LLSLURL::SLURL_HTTPS_SCHEME)
|| (slurl_uri.scheme() == LLSLURL::SLURL_X_GRID_LOCATION_INFO_SCHEME)
@@ -309,13 +255,6 @@ LLSLURL::LLSLURL(const std::string& slurl)
else
mGrid = default_grid;
}
- // places.inworldz.com isn't your regular everyday slurl
- else if (slurl_uri.hostName() == LLSLURL::PLACES_INWORLDZ_COM)
- {
- // likewise, places.inworldz.com implies inworldz and a location
- mGrid = INWORLDZ_URI;
- mType = LOCATION;
- }
else
{
LL_DEBUGS("SLURL") << "slurl style Standalone" << LL_ENDL;
@@ -402,7 +341,7 @@ LLSLURL::LLSLURL(const std::string& slurl)
LL_DEBUGS("SLURL") << "It's a location hop" << LL_ENDL;
mType = LOCATION;
}
- else if (slurl_uri.hostName() != LLSLURL::PLACES_INWORLDZ_COM)
+ else
{
LL_DEBUGS("SLURL") << "Not a valid https/http/x-grid-location-info slurl " << slurl << LL_ENDL;
// not a valid https/http/x-grid-location-info slurl, so it'll likely just be a URL
diff --git a/indra/newview/skins/default/xui/pl/floater_joystick.xml b/indra/newview/skins/default/xui/pl/floater_joystick.xml
index e0543a27e0..151c4b72c8 100644
--- a/indra/newview/skins/default/xui/pl/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/pl/floater_joystick.xml
@@ -19,14 +19,53 @@
-
-
-
-
-
-
-
-
+
+ Monitor joysticka
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Skala X
diff --git a/indra/newview/skins/default/xui/pl/floater_tools.xml b/indra/newview/skins/default/xui/pl/floater_tools.xml
index 36538e0b64..38ae7cf730 100644
--- a/indra/newview/skins/default/xui/pl/floater_tools.xml
+++ b/indra/newview/skins/default/xui/pl/floater_tools.xml
@@ -86,7 +86,7 @@
-
+
diff --git a/indra/newview/skins/default/xui/ru/floater_joystick.xml b/indra/newview/skins/default/xui/ru/floater_joystick.xml
index 0f50433064..1fbe8e8457 100644
--- a/indra/newview/skins/default/xui/ru/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/ru/floater_joystick.xml
@@ -1,17 +1,20 @@
- никто
+ Нет
+
+ Джойстик:
+
-
-
-
-
+
+
+
+
-
+
Режимы управления:
@@ -19,60 +22,99 @@
-
-
-
-
-
-
-
-
+
+ Монитор джойстика
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- Масштаб по X
+ Шкала X
- Масштаб по Y
+ Шкала Y
- Масштаб по Z
+ Шкала Z
- Масштаб наклона
+ Шкала наклона
- Масштаб рыскания
+ Шкала рыскания
- Масштаб вращения
+ Шкала вращения
- Невидимая зона по X
+ Своб.зона X
- Невидимая зона по Y
+ Своб.зона Y
- Невидимая зона по Z
+ Своб.зона Z
- Невид. зона наклона
+ Своб.зона Наклона
- Невид. зона рыскания
+ Своб.зона Рыскания
- Невид. зона вращения
+ Своб.зона Вращения
- Размывка краев
+ Сглаживание
- Масштаб
+ Шкала Масштаба
- Невид. зона масшт.
+ Своб.зона Масштаба
-
-
+
+