diff options
author | David Seikel | 2011-02-10 22:49:30 +1000 |
---|---|---|
committer | David Seikel | 2011-02-10 22:49:30 +1000 |
commit | 10a79156a44bcd3a84488e083cc6e46b1320856e (patch) | |
tree | 324954db2cf0a896d4daf81cfd5c6c0fcdd829cf /linden | |
parent | For meta7 - while LL reserves the first 5 estate numbers for it's own use, we... (diff) | |
download | meta-impy-10a79156a44bcd3a84488e083cc6e46b1320856e.zip meta-impy-10a79156a44bcd3a84488e083cc6e46b1320856e.tar.gz meta-impy-10a79156a44bcd3a84488e083cc6e46b1320856e.tar.bz2 meta-impy-10a79156a44bcd3a84488e083cc6e46b1320856e.tar.xz |
Remove special handling of linden estates. We don't have them in meta, and that sort of policy should be server side anyway.
It's good to remove useless code. As usual I found three ways of recognising linden estates being used in the code, makes it hard to find them all. Might be some left over.
Diffstat (limited to 'linden')
16 files changed, 34 insertions, 424 deletions
diff --git a/linden/indra/llmessage/llregionflags.h b/linden/indra/llmessage/llregionflags.h index fd6d0a3..70c3499 100644 --- a/linden/indra/llmessage/llregionflags.h +++ b/linden/indra/llmessage/llregionflags.h | |||
@@ -137,15 +137,6 @@ inline U32 unset_prelude_flags(U32 flags) | |||
137 | & ~(REGION_FLAGS_PRELUDE_SET | REGION_FLAGS_SUN_FIXED)); | 137 | & ~(REGION_FLAGS_PRELUDE_SET | REGION_FLAGS_SUN_FIXED)); |
138 | } | 138 | } |
139 | 139 | ||
140 | // estate constants. Need to match first few etries in indra.estate table. | ||
141 | const U32 ESTATE_ALL = 0; // will not match in db, reserved key for logic | ||
142 | const U32 ESTATE_MAINLAND = 1; | ||
143 | const U32 ESTATE_ORIENTATION = 2; | ||
144 | const U32 ESTATE_INTERNAL = 3; | ||
145 | const U32 ESTATE_SHOWCASE = 4; | ||
146 | const U32 ESTATE_TEEN = 5; | ||
147 | const U32 ESTATE_LAST_LINDEN = 1; // last linden owned/managed estate | ||
148 | |||
149 | // for EstateOwnerRequest, setaccess message | 140 | // for EstateOwnerRequest, setaccess message |
150 | const U32 ESTATE_ACCESS_ALLOWED_AGENTS = 1 << 0; | 141 | const U32 ESTATE_ACCESS_ALLOWED_AGENTS = 1 << 0; |
151 | const U32 ESTATE_ACCESS_ALLOWED_GROUPS = 1 << 1; | 142 | const U32 ESTATE_ACCESS_ALLOWED_GROUPS = 1 << 1; |
diff --git a/linden/indra/newview/llfloaterregioninfo.cpp b/linden/indra/newview/llfloaterregioninfo.cpp index d4ffe22..163c1ec 100644 --- a/linden/indra/newview/llfloaterregioninfo.cpp +++ b/linden/indra/newview/llfloaterregioninfo.cpp | |||
@@ -362,13 +362,7 @@ void LLFloaterRegionInfo::processRegionInfo(LLMessageSystem* msg) | |||
362 | panel->childSetValue("object_bonus_spin", LLSD(object_bonus_factor) ); | 362 | panel->childSetValue("object_bonus_spin", LLSD(object_bonus_factor) ); |
363 | panel->childSetValue("access_combo", LLSD(sim_access) ); | 363 | panel->childSetValue("access_combo", LLSD(sim_access) ); |
364 | 364 | ||
365 | 365 | panel->childSetEnabled("access_combo", gAgent.isGodlike() || (region && region->canManageEstate() )); | |
366 | // detect teen grid for maturity | ||
367 | |||
368 | U32 parent_estate_id; | ||
369 | msg->getU32("RegionInfo", "ParentEstateID", parent_estate_id); | ||
370 | BOOL teen_grid = (parent_estate_id == 5); // *TODO add field to estate table and test that | ||
371 | panel->childSetEnabled("access_combo", gAgent.isGodlike() || (region && region->canManageEstate() && !teen_grid)); | ||
372 | panel->setCtrlsEnabled(allow_modify); | 366 | panel->setCtrlsEnabled(allow_modify); |
373 | 367 | ||
374 | // RegionSettings PANEL | 368 | // RegionSettings PANEL |
@@ -1650,16 +1644,9 @@ void LLPanelEstateInfo::onClickAddAllowedGroup(void* user_data) | |||
1650 | return; | 1644 | return; |
1651 | } | 1645 | } |
1652 | 1646 | ||
1653 | LLNotification::Params params("ChangeLindenAccess"); | 1647 | LLNotification::Params params("PfftLindenCrap"); |
1654 | params.functor(boost::bind(&LLPanelEstateInfo::addAllowedGroup, self, _1, _2)); | 1648 | params.functor(boost::bind(&LLPanelEstateInfo::addAllowedGroup, self, _1, _2)); |
1655 | if (isLindenEstate()) | 1649 | LLNotifications::instance().forceResponse(params, 0); |
1656 | { | ||
1657 | LLNotifications::instance().add(params); | ||
1658 | } | ||
1659 | else | ||
1660 | { | ||
1661 | LLNotifications::instance().forceResponse(params, 0); | ||
1662 | } | ||
1663 | } | 1650 | } |
1664 | 1651 | ||
1665 | bool LLPanelEstateInfo::addAllowedGroup(const LLSD& notification, const LLSD& response) | 1652 | bool LLPanelEstateInfo::addAllowedGroup(const LLSD& notification, const LLSD& response) |
@@ -1837,16 +1824,6 @@ std::string all_estates_text() | |||
1837 | } | 1824 | } |
1838 | } | 1825 | } |
1839 | 1826 | ||
1840 | // static | ||
1841 | bool LLPanelEstateInfo::isLindenEstate() | ||
1842 | { | ||
1843 | LLPanelEstateInfo* panel = LLFloaterRegionInfo::getPanelEstate(); | ||
1844 | if (!panel) return false; | ||
1845 | |||
1846 | U32 estate_id = panel->getEstateID(); | ||
1847 | return (estate_id <= ESTATE_LAST_LINDEN); | ||
1848 | } | ||
1849 | |||
1850 | typedef std::vector<LLUUID> AgentOrGroupIDsVector; | 1827 | typedef std::vector<LLUUID> AgentOrGroupIDsVector; |
1851 | struct LLEstateAccessChangeInfo | 1828 | struct LLEstateAccessChangeInfo |
1852 | { | 1829 | { |
@@ -1898,14 +1875,7 @@ void LLPanelEstateInfo::addAllowedGroup2(LLUUID id, void* user_data) | |||
1898 | params.payload(payload) | 1875 | params.payload(payload) |
1899 | .substitutions(args) | 1876 | .substitutions(args) |
1900 | .functor(accessCoreConfirm); | 1877 | .functor(accessCoreConfirm); |
1901 | if (isLindenEstate()) | 1878 | LLNotifications::instance().add(params); |
1902 | { | ||
1903 | LLNotifications::instance().forceResponse(params, 0); | ||
1904 | } | ||
1905 | else | ||
1906 | { | ||
1907 | LLNotifications::instance().add(params); | ||
1908 | } | ||
1909 | } | 1879 | } |
1910 | 1880 | ||
1911 | // static | 1881 | // static |
@@ -1916,19 +1886,12 @@ void LLPanelEstateInfo::accessAddCore(U32 operation_flag, const std::string& dia | |||
1916 | payload["dialog_name"] = dialog_name; | 1886 | payload["dialog_name"] = dialog_name; |
1917 | // agent id filled in after avatar picker | 1887 | // agent id filled in after avatar picker |
1918 | 1888 | ||
1919 | LLNotification::Params params("ChangeLindenAccess"); | 1889 | LLNotification::Params params("PfftLindenCrap"); |
1920 | params.payload(payload) | 1890 | params.payload(payload) |
1921 | .functor(accessAddCore2); | 1891 | .functor(accessAddCore2); |
1922 | 1892 | ||
1923 | if (isLindenEstate()) | 1893 | // same as clicking "OK" |
1924 | { | 1894 | LLNotifications::instance().forceResponse(params, 0); |
1925 | LLNotifications::instance().add(params); | ||
1926 | } | ||
1927 | else | ||
1928 | { | ||
1929 | // same as clicking "OK" | ||
1930 | LLNotifications::instance().forceResponse(params, 0); | ||
1931 | } | ||
1932 | } | 1895 | } |
1933 | 1896 | ||
1934 | // static | 1897 | // static |
@@ -2008,16 +1971,8 @@ void LLPanelEstateInfo::accessAddCore3(const std::vector<std::string>& names, co | |||
2008 | .payload(change_info->asLLSD()) | 1971 | .payload(change_info->asLLSD()) |
2009 | .functor(accessCoreConfirm); | 1972 | .functor(accessCoreConfirm); |
2010 | 1973 | ||
2011 | if (isLindenEstate()) | 1974 | // ask if this estate or all estates with this owner |
2012 | { | 1975 | LLNotifications::instance().add(params); |
2013 | // just apply to this estate | ||
2014 | LLNotifications::instance().forceResponse(params, 0); | ||
2015 | } | ||
2016 | else | ||
2017 | { | ||
2018 | // ask if this estate or all estates with this owner | ||
2019 | LLNotifications::instance().add(params); | ||
2020 | } | ||
2021 | } | 1976 | } |
2022 | 1977 | ||
2023 | // static | 1978 | // static |
@@ -2044,20 +1999,12 @@ void LLPanelEstateInfo::accessRemoveCore(U32 operation_flag, const std::string& | |||
2044 | payload["allowed_ids"].append(item->getUUID()); | 1999 | payload["allowed_ids"].append(item->getUUID()); |
2045 | } | 2000 | } |
2046 | 2001 | ||
2047 | LLNotification::Params params("ChangeLindenAccess"); | 2002 | LLNotification::Params params("PfftLindenCrap"); |
2048 | params.payload(payload) | 2003 | params.payload(payload) |
2049 | .functor(accessRemoveCore2); | 2004 | .functor(accessRemoveCore2); |
2050 | 2005 | ||
2051 | if (isLindenEstate()) | 2006 | // just proceed, as if clicking OK |
2052 | { | 2007 | LLNotifications::instance().forceResponse(params, 0); |
2053 | // warn on change linden estate | ||
2054 | LLNotifications::instance().add(params); | ||
2055 | } | ||
2056 | else | ||
2057 | { | ||
2058 | // just proceed, as if clicking OK | ||
2059 | LLNotifications::instance().forceResponse(params, 0); | ||
2060 | } | ||
2061 | } | 2008 | } |
2062 | 2009 | ||
2063 | // static | 2010 | // static |
@@ -2070,21 +2017,12 @@ bool LLPanelEstateInfo::accessRemoveCore2(const LLSD& notification, const LLSD& | |||
2070 | return false; | 2017 | return false; |
2071 | } | 2018 | } |
2072 | 2019 | ||
2073 | // If Linden estate, can only apply to "this" estate, not all estates | 2020 | LLSD args; |
2074 | // owned by NULL. | 2021 | args["ALL_ESTATES"] = all_estates_text(); |
2075 | if (isLindenEstate()) | 2022 | LLNotifications::instance().add(notification["payload"]["dialog_name"], |
2076 | { | 2023 | args, |
2077 | accessCoreConfirm(notification, response); | 2024 | notification["payload"], |
2078 | } | 2025 | accessCoreConfirm); |
2079 | else | ||
2080 | { | ||
2081 | LLSD args; | ||
2082 | args["ALL_ESTATES"] = all_estates_text(); | ||
2083 | LLNotifications::instance().add(notification["payload"]["dialog_name"], | ||
2084 | args, | ||
2085 | notification["payload"], | ||
2086 | accessCoreConfirm); | ||
2087 | } | ||
2088 | return false; | 2026 | return false; |
2089 | } | 2027 | } |
2090 | 2028 | ||
@@ -2366,52 +2304,23 @@ BOOL LLPanelEstateInfo::sendUpdate() | |||
2366 | { | 2304 | { |
2367 | llinfos << "LLPanelEsateInfo::sendUpdate()" << llendl; | 2305 | llinfos << "LLPanelEsateInfo::sendUpdate()" << llendl; |
2368 | 2306 | ||
2369 | LLNotification::Params params("ChangeLindenEstate"); | 2307 | // send the update |
2370 | params.functor(boost::bind(&LLPanelEstateInfo::callbackChangeLindenEstate, this, _1, _2)); | 2308 | if (!commitEstateInfoCaps()) |
2371 | |||
2372 | if (getEstateID() <= ESTATE_LAST_LINDEN) | ||
2373 | { | ||
2374 | // trying to change reserved estate, warn | ||
2375 | LLNotifications::instance().add(params); | ||
2376 | } | ||
2377 | else | ||
2378 | { | 2309 | { |
2379 | // for normal estates, just make the change | 2310 | // the caps method failed, try the old way |
2380 | LLNotifications::instance().forceResponse(params, 0); | 2311 | LLFloaterRegionInfo::nextInvoice(); |
2312 | commitEstateInfoDataserver(); | ||
2381 | } | 2313 | } |
2314 | // we don't want to do this because we'll get it automatically from the sim | ||
2315 | // after the spaceserver processes it | ||
2316 | // else | ||
2317 | // { | ||
2318 | // // caps method does not automatically send this info | ||
2319 | // LLFloaterRegionInfo::requestRegionInfo(); | ||
2320 | // } | ||
2382 | return TRUE; | 2321 | return TRUE; |
2383 | } | 2322 | } |
2384 | 2323 | ||
2385 | bool LLPanelEstateInfo::callbackChangeLindenEstate(const LLSD& notification, const LLSD& response) | ||
2386 | { | ||
2387 | S32 option = LLNotification::getSelectedOption(notification, response); | ||
2388 | switch(option) | ||
2389 | { | ||
2390 | case 0: | ||
2391 | // send the update | ||
2392 | if (!commitEstateInfoCaps()) | ||
2393 | { | ||
2394 | // the caps method failed, try the old way | ||
2395 | LLFloaterRegionInfo::nextInvoice(); | ||
2396 | commitEstateInfoDataserver(); | ||
2397 | } | ||
2398 | // we don't want to do this because we'll get it automatically from the sim | ||
2399 | // after the spaceserver processes it | ||
2400 | // else | ||
2401 | // { | ||
2402 | // // caps method does not automatically send this info | ||
2403 | // LLFloaterRegionInfo::requestRegionInfo(); | ||
2404 | // } | ||
2405 | break; | ||
2406 | case 1: | ||
2407 | default: | ||
2408 | // do nothing | ||
2409 | break; | ||
2410 | } | ||
2411 | return false; | ||
2412 | } | ||
2413 | |||
2414 | |||
2415 | /* | 2324 | /* |
2416 | // Request = "getowner" | 2325 | // Request = "getowner" |
2417 | // SParam[0] = "" (empty string) | 2326 | // SParam[0] = "" (empty string) |
@@ -2664,47 +2573,6 @@ void LLPanelEstateInfo::setAbuseEmailAddress(const std::string& address) | |||
2664 | childSetValue("abuse_email_address", LLSD(address)); | 2573 | childSetValue("abuse_email_address", LLSD(address)); |
2665 | } | 2574 | } |
2666 | 2575 | ||
2667 | void LLPanelEstateInfo::setAccessAllowedEnabled(bool enable_agent, | ||
2668 | bool enable_group, | ||
2669 | bool enable_ban) | ||
2670 | { | ||
2671 | childSetEnabled("allow_resident_label", enable_agent); | ||
2672 | childSetEnabled("allowed_avatar_name_list", enable_agent); | ||
2673 | childSetVisible("allowed_avatar_name_list", enable_agent); | ||
2674 | childSetEnabled("add_allowed_avatar_btn", enable_agent); | ||
2675 | childSetEnabled("remove_allowed_avatar_btn", enable_agent); | ||
2676 | |||
2677 | // Groups | ||
2678 | childSetEnabled("allow_group_label", enable_group); | ||
2679 | childSetEnabled("allowed_group_name_list", enable_group); | ||
2680 | childSetVisible("allowed_group_name_list", enable_group); | ||
2681 | childSetEnabled("add_allowed_group_btn", enable_group); | ||
2682 | childSetEnabled("remove_allowed_group_btn", enable_group); | ||
2683 | |||
2684 | // Ban | ||
2685 | childSetEnabled("ban_resident_label", enable_ban); | ||
2686 | childSetEnabled("banned_avatar_name_list", enable_ban); | ||
2687 | childSetVisible("banned_avatar_name_list", enable_ban); | ||
2688 | childSetEnabled("add_banned_avatar_btn", enable_ban); | ||
2689 | childSetEnabled("remove_banned_avatar_btn", enable_ban); | ||
2690 | |||
2691 | // Update removal buttons if needed | ||
2692 | if (enable_agent) | ||
2693 | { | ||
2694 | checkRemovalButton("allowed_avatar_name_list"); | ||
2695 | } | ||
2696 | |||
2697 | if (enable_group) | ||
2698 | { | ||
2699 | checkRemovalButton("allowed_group_name_list"); | ||
2700 | } | ||
2701 | |||
2702 | if (enable_ban) | ||
2703 | { | ||
2704 | checkRemovalButton("banned_avatar_name_list"); | ||
2705 | } | ||
2706 | } | ||
2707 | |||
2708 | // static | 2576 | // static |
2709 | void LLPanelEstateInfo::callbackCacheName( | 2577 | void LLPanelEstateInfo::callbackCacheName( |
2710 | const LLUUID& id, | 2578 | const LLUUID& id, |
@@ -3241,20 +3109,6 @@ bool LLDispatchEstateUpdateInfo::operator()( | |||
3241 | panel->setSunHour(sun_hour); | 3109 | panel->setSunHour(sun_hour); |
3242 | } | 3110 | } |
3243 | 3111 | ||
3244 | bool visible_from_mainland = (bool)(flags & REGION_FLAGS_EXTERNALLY_VISIBLE); | ||
3245 | bool god = gAgent.isGodlike(); | ||
3246 | bool linden_estate = (estate_id <= ESTATE_LAST_LINDEN); | ||
3247 | |||
3248 | // If visible from mainland, disable the access allowed | ||
3249 | // UI, as anyone can teleport there. | ||
3250 | // However, gods need to be able to edit the access list for | ||
3251 | // linden estates, regardless of visibility, to allow object | ||
3252 | // and L$ transfers. | ||
3253 | bool enable_agent = (!visible_from_mainland || (god && linden_estate)); | ||
3254 | bool enable_group = enable_agent; | ||
3255 | bool enable_ban = !linden_estate; | ||
3256 | panel->setAccessAllowedEnabled(enable_agent, enable_group, enable_ban); | ||
3257 | |||
3258 | return true; | 3112 | return true; |
3259 | } | 3113 | } |
3260 | 3114 | ||
diff --git a/linden/indra/newview/llfloaterregioninfo.h b/linden/indra/newview/llfloaterregioninfo.h index ae0c993..f5e3d03 100644 --- a/linden/indra/newview/llfloaterregioninfo.h +++ b/linden/indra/newview/llfloaterregioninfo.h | |||
@@ -344,7 +344,6 @@ public: | |||
344 | 344 | ||
345 | U32 getEstateID() const { return mEstateID; } | 345 | U32 getEstateID() const { return mEstateID; } |
346 | void setEstateID(U32 estate_id) { mEstateID = estate_id; } | 346 | void setEstateID(U32 estate_id) { mEstateID = estate_id; } |
347 | static bool isLindenEstate(); | ||
348 | 347 | ||
349 | const std::string getOwnerName() const; | 348 | const std::string getOwnerName() const; |
350 | void setOwnerName(const std::string& name); | 349 | void setOwnerName(const std::string& name); |
@@ -352,10 +351,6 @@ public: | |||
352 | const std::string getAbuseEmailAddress() const; | 351 | const std::string getAbuseEmailAddress() const; |
353 | void setAbuseEmailAddress(const std::string& address); | 352 | void setAbuseEmailAddress(const std::string& address); |
354 | 353 | ||
355 | // If visible from mainland, allowed agent and allowed groups | ||
356 | // are ignored, so must disable UI. | ||
357 | void setAccessAllowedEnabled(bool enable_agent, bool enable_group, bool enable_ban); | ||
358 | |||
359 | // this must have the same function signature as | 354 | // this must have the same function signature as |
360 | // llmessage/llcachename.h:LLCacheNameCallback | 355 | // llmessage/llcachename.h:LLCacheNameCallback |
361 | static void callbackCacheName( | 356 | static void callbackCacheName( |
@@ -367,8 +362,6 @@ public: | |||
367 | 362 | ||
368 | protected: | 363 | protected: |
369 | virtual BOOL sendUpdate(); | 364 | virtual BOOL sendUpdate(); |
370 | // confirmation dialog callback | ||
371 | bool callbackChangeLindenEstate(const LLSD& notification, const LLSD& response); | ||
372 | 365 | ||
373 | void commitEstateInfoDataserver(); | 366 | void commitEstateInfoDataserver(); |
374 | bool commitEstateInfoCaps(); | 367 | bool commitEstateInfoCaps(); |
diff --git a/linden/indra/newview/skins/default/xui/de/notifications.xml b/linden/indra/newview/skins/default/xui/de/notifications.xml index b2975df..3e08d33 100644 --- a/linden/indra/newview/skins/default/xui/de/notifications.xml +++ b/linden/indra/newview/skins/default/xui/de/notifications.xml | |||
@@ -1442,21 +1442,6 @@ Die Option zum Austritt aus einer Gruppe finden Sie unter „Bearbeiten“ > | |||
1442 | <button name="Cancel" text="Abbrechen"/> | 1442 | <button name="Cancel" text="Abbrechen"/> |
1443 | </form> | 1443 | </form> |
1444 | </notification> | 1444 | </notification> |
1445 | <notification label="Linden-Grundstück ändern" name="ChangeLindenEstate"> | ||
1446 | Sie sind im Begriff, ein Grundstück in Linden-Besitz (Mainland, Teen-Raster, Orientierung usw.) zu verändern. | ||
1447 | |||
1448 | Dies ist ÄUSSERST GEFÄHRLICH, da es grundlegende Auswirkungen auf das Benutzererlebnis hat. Auf dem Mainland werden tausende Regionen geändert, was den Spaceserver stark belastet. | ||
1449 | |||
1450 | Fortfahren? | ||
1451 | <usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/> | ||
1452 | </notification> | ||
1453 | <notification label="Zugang zu Linden-Grundstück ändern" name="ChangeLindenAccess"> | ||
1454 | Sie sind im Begriff, die Zugangsliste für ein Grundstück in Linden-Besitz (Mainland, Teen-Raster, Orientierung usw.) zu verändern. | ||
1455 | |||
1456 | Dies ist GEFÄHRLICH und sollte nur erfolgen, um Objekte/L$ per Hack in und aus dem Raster zu entfernen. | ||
1457 | Tausende Regionen werden verändert und der Spaceserver wird dadurch stark belastet. | ||
1458 | <usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/> | ||
1459 | </notification> | ||
1460 | <notification label="Grundstück wählen" name="EstateAllowedAgentAdd"> | 1445 | <notification label="Grundstück wählen" name="EstateAllowedAgentAdd"> |
1461 | Nur für dieses Grundstück oder für alle [ALL_ESTATES] zur Erlaubnisliste hinzufügen? | 1446 | Nur für dieses Grundstück oder für alle [ALL_ESTATES] zur Erlaubnisliste hinzufügen? |
1462 | <usetemplate canceltext="Abbrechen" name="yesnocancelbuttons" notext="Alle Grundstücke" yestext="Dieses Grundstück"/> | 1447 | <usetemplate canceltext="Abbrechen" name="yesnocancelbuttons" notext="Alle Grundstücke" yestext="Dieses Grundstück"/> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml index b8f3fcb..69aa30e 100644 --- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml +++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml | |||
@@ -3194,30 +3194,11 @@ Type a short announcement which will be sent to everyone currently in your estat | |||
3194 | 3194 | ||
3195 | <notification | 3195 | <notification |
3196 | icon="alert.tga" | 3196 | icon="alert.tga" |
3197 | label="Change Linden Estate" | 3197 | label="Pfft some old linden crap" |
3198 | name="ChangeLindenEstate" | 3198 | name="PfftLindenCrap" |
3199 | type="alert"> | 3199 | type="alert"> |
3200 | You are about to change a Linden owned estate (mainland, teen grid, orientation, etc.). | 3200 | This used to be some Linden inspired crap, but should never be seen now. |
3201 | 3201 | Still unravelling the code before I make this go away. | |
3202 | This is EXTREMELY DANGEROUS because it can fundamentally affect the user experience. On the mainland, it will change thousands of regions and make the spaceserver hiccup. | ||
3203 | |||
3204 | Proceed? | ||
3205 | <usetemplate | ||
3206 | name="okcancelbuttons" | ||
3207 | notext="Cancel" | ||
3208 | yestext="OK"/> | ||
3209 | </notification> | ||
3210 | |||
3211 | <notification | ||
3212 | icon="alert.tga" | ||
3213 | label="Change Linden Estate Access" | ||
3214 | name="ChangeLindenAccess" | ||
3215 | type="alert"> | ||
3216 | You are about to change the access list for a Linden owned estate (mainland, teen grid, orientation, etc.). | ||
3217 | |||
3218 | This is DANGEROUS and should only be done to invoke the hack allowing objects/[CURRENCY] to be transfered in/out of a grid. | ||
3219 | |||
3220 | It will change thousands of regions and make the spaceserver hiccup. | ||
3221 | <usetemplate | 3202 | <usetemplate |
3222 | name="okcancelbuttons" | 3203 | name="okcancelbuttons" |
3223 | notext="Cancel" | 3204 | notext="Cancel" |
diff --git a/linden/indra/newview/skins/default/xui/es/notifications.xml b/linden/indra/newview/skins/default/xui/es/notifications.xml index f39dfc9..f3a862d 100644 --- a/linden/indra/newview/skins/default/xui/es/notifications.xml +++ b/linden/indra/newview/skins/default/xui/es/notifications.xml | |||
@@ -1454,21 +1454,6 @@ Se ocultará el chat y los mensajes instantáneos. Los mensajes instantáneos re | |||
1454 | <button name="Cancel" text="Cancelar"/> | 1454 | <button name="Cancel" text="Cancelar"/> |
1455 | </form> | 1455 | </form> |
1456 | </notification> | 1456 | </notification> |
1457 | <notification label="Cambiar un estado Linden" name="ChangeLindenEstate"> | ||
1458 | Va a hacer cambios en un estado propiedad de Linden (mainland, grid teen, orientación, etc.). | ||
1459 | |||
1460 | Esto es EXTREMADAMENTE PELIGROSO, porque puede afectar radicalmente al funcionamiento de los usuarios. En mainland, se cambiarán miles de regiones, y se provocará un colapso en el espacio del servidor. | ||
1461 | |||
1462 | ¿Proceder? | ||
1463 | <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/> | ||
1464 | </notification> | ||
1465 | <notification label="Cambiar el acceso a un estado Linden" name="ChangeLindenAccess"> | ||
1466 | Va a cambiar la lista de acceso de un estado propiedad de Linden (mainland, grid teen, orientación, etc.). | ||
1467 | |||
1468 | Esto es PELIGROSO, y sólo debe hacerse para deshacerse de ataques que permitan sacar o meter en el grid objetos o L$. | ||
1469 | Se cambiarán miles de regiones, y se provocará un colapso en el espacio del servidor. | ||
1470 | <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/> | ||
1471 | </notification> | ||
1472 | <notification label="Seleccionar el estado" name="EstateAllowedAgentAdd"> | 1457 | <notification label="Seleccionar el estado" name="EstateAllowedAgentAdd"> |
1473 | ¿Añadir a la lista de permitidos sólo para este estado o para [ALL_ESTATES]? | 1458 | ¿Añadir a la lista de permitidos sólo para este estado o para [ALL_ESTATES]? |
1474 | <usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todos los estados" yestext="Este estado"/> | 1459 | <usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todos los estados" yestext="Este estado"/> |
diff --git a/linden/indra/newview/skins/default/xui/fr/notifications.xml b/linden/indra/newview/skins/default/xui/fr/notifications.xml index 6911f8b..dc7e61f 100644 --- a/linden/indra/newview/skins/default/xui/fr/notifications.xml +++ b/linden/indra/newview/skins/default/xui/fr/notifications.xml | |||
@@ -1425,21 +1425,6 @@ Pour quitter un groupe, sélectionnez l'option Groupe dans le menu Éditer. | |||
1425 | <button name="Cancel" text="Annuler"/> | 1425 | <button name="Cancel" text="Annuler"/> |
1426 | </form> | 1426 | </form> |
1427 | </notification> | 1427 | </notification> |
1428 | <notification label="Modifier un domaine Linden" name="ChangeLindenEstate"> | ||
1429 | Vous vous apprêtez à modifier un domaine appartenant aux Lindens (continent, zone réservée aux ados, orientation etc.). | ||
1430 | |||
1431 | Cela est extrêmement délicat car l'expérience des résidents est en jeu. Sur le continent, cela modifiera des milliers de régions et sera difficile à digérer pour le serveur. | ||
1432 | |||
1433 | Continuer ? | ||
1434 | <usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/> | ||
1435 | </notification> | ||
1436 | <notification label="Modifier l'accès à un domaine Linden" name="ChangeLindenAccess"> | ||
1437 | Vous vous apprêtez à modifier la liste d'accès à un domaine appartenant aux Linden (continent, zone réservée aux ados, orientation etc.). | ||
1438 | |||
1439 | Cette action est délicate et ne doit être effectuée que pour appeler le hack autorisant des objets/L$ à être transférés à l'intérieur/extérieur de la grille. | ||
1440 | Cette action modifiera des milliers de régions et sera difficile à digérer pour le serveur. | ||
1441 | <usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/> | ||
1442 | </notification> | ||
1443 | <notification label="Choisir le domaine" name="EstateAllowedAgentAdd"> | 1428 | <notification label="Choisir le domaine" name="EstateAllowedAgentAdd"> |
1444 | Ajouter à la liste des résidents autorisés uniquement pour ce domaine ou pour [ALL_ESTATES] ? | 1429 | Ajouter à la liste des résidents autorisés uniquement pour ce domaine ou pour [ALL_ESTATES] ? |
1445 | <usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Tous les domaines" yestext="Ce domaine"/> | 1430 | <usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Tous les domaines" yestext="Ce domaine"/> |
diff --git a/linden/indra/newview/skins/default/xui/hu/notifications.xml b/linden/indra/newview/skins/default/xui/hu/notifications.xml index bf41284..6bc188d 100644 --- a/linden/indra/newview/skins/default/xui/hu/notifications.xml +++ b/linden/indra/newview/skins/default/xui/hu/notifications.xml | |||
@@ -1317,19 +1317,6 @@ A csoportból való kilépéshez válaszd a 'Csoportok...' részt a &a | |||
1317 | <notification label="Üzenetküldés mindenki számára a telkeden" name="MessageEstate"> | 1317 | <notification label="Üzenetküldés mindenki számára a telkeden" name="MessageEstate"> |
1318 | Rövid bejelentés írása, amely elküldésre mindenki részére, aki az ingatlanodon tartózkodik. | 1318 | Rövid bejelentés írása, amely elküldésre mindenki részére, aki az ingatlanodon tartózkodik. |
1319 | </notification> | 1319 | </notification> |
1320 | <notification label="Linden telek változtatása" name="ChangeLindenEstate"> | ||
1321 | Linden tulajdonú telek változtatása folyamatban (mainland, teen grid, orientation, stb.). | ||
1322 | |||
1323 | Ez NAGYON VESZÉLYES, mivel kihatással van a felhasználók megszokásaira. A mainland-en ez régiók ezreit befolyásolja, amely a 'spaceserver' működésében akadályokat okoz. | ||
1324 | |||
1325 | Folytatod? | ||
1326 | </notification> | ||
1327 | <notification label="Linden telek belépésének változtatása" name="ChangeLindenAccess"> | ||
1328 | Linden tulajdonú telek változtatása folyamatban (mainland, teen grid, orientation, stb.). | ||
1329 | |||
1330 | This is DANGEROUS and should only be done to invoke the hack allowing objects/L$ to be transfered in/out of a grid. | ||
1331 | A mainland-en ez régiók ezreit befolyásolja, amely a 'spaceserver' működésében akadályokat okoz. | ||
1332 | </notification> | ||
1333 | <notification label="Ingatlan kiválasztása" name="EstateAllowedAgentAdd"> | 1320 | <notification label="Ingatlan kiválasztása" name="EstateAllowedAgentAdd"> |
1334 | Engedélyezettek listájához való hozzáadása csak ennek az ingatlan vagy [ALL_ESTATES] esetén? | 1321 | Engedélyezettek listájához való hozzáadása csak ennek az ingatlan vagy [ALL_ESTATES] esetén? |
1335 | </notification> | 1322 | </notification> |
diff --git a/linden/indra/newview/skins/default/xui/it/notifications.xml b/linden/indra/newview/skins/default/xui/it/notifications.xml index 61aafae..039a6d1 100644 --- a/linden/indra/newview/skins/default/xui/it/notifications.xml +++ b/linden/indra/newview/skins/default/xui/it/notifications.xml | |||
@@ -1452,21 +1452,6 @@ Per abbandonare un gruppo seleziona l'opzione 'Gruppi..' dal menu | |||
1452 | <button name="Cancel" text="Annulla"/> | 1452 | <button name="Cancel" text="Annulla"/> |
1453 | </form> | 1453 | </form> |
1454 | </notification> | 1454 | </notification> |
1455 | <notification label="Cambia la tipologia della proprietà Linden" name="ChangeLindenEstate"> | ||
1456 | Stai per cambiare la tipologia della proprietà Linden (mainland, griglia minorenni, orientamento, ecc.). | ||
1457 | |||
1458 | Questo è ESTREMAMENTE PERICOLOSO perchè può cambiare radicalmente l'esperienza degli utenti. Sulla mainland cambierà migliaia di regioni e produrrà seri problemi ai vari server. | ||
1459 | |||
1460 | Confermi? | ||
1461 | <usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/> | ||
1462 | </notification> | ||
1463 | <notification label="Cambia la tipologia Linden di accesso alla proprietà" name="ChangeLindenAccess"> | ||
1464 | Stai per cambiare la lista di accesso per una proprietà Linden (mainland, griglia minorenni, orientamento, ecc.). | ||
1465 | |||
1466 | Questo è PERICOLOSO e dovrebbe essere fatto soltanto per poter lanciare il programma che consente agli oggetti/L$ di essere trasferiti fra griglie diverse. | ||
1467 | Cambierà migliaia di regioni e produrrà seri problemi ai vari server. | ||
1468 | <usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/> | ||
1469 | </notification> | ||
1470 | <notification label="Seleziona la proprietà" name="EstateAllowedAgentAdd"> | 1455 | <notification label="Seleziona la proprietà" name="EstateAllowedAgentAdd"> |
1471 | Aggiungi alla lista di accesso solo per questa proprietà oppure per [ALL_ESTATES]? | 1456 | Aggiungi alla lista di accesso solo per questa proprietà oppure per [ALL_ESTATES]? |
1472 | <usetemplate canceltext="Annulla" name="yesnocancelbuttons" notext="Tutte le proprietà" yestext="Questa proprietà"/> | 1457 | <usetemplate canceltext="Annulla" name="yesnocancelbuttons" notext="Tutte le proprietà" yestext="Questa proprietà"/> |
diff --git a/linden/indra/newview/skins/default/xui/ja/notifications.xml b/linden/indra/newview/skins/default/xui/ja/notifications.xml index 6da6ccc..fa63cf0 100644 --- a/linden/indra/newview/skins/default/xui/ja/notifications.xml +++ b/linden/indra/newview/skins/default/xui/ja/notifications.xml | |||
@@ -1526,21 +1526,6 @@ F1キーを押してください。 | |||
1526 | <button name="Cancel" text="取り消し"/> | 1526 | <button name="Cancel" text="取り消し"/> |
1527 | </form> | 1527 | </form> |
1528 | </notification> | 1528 | </notification> |
1529 | <notification label="Lindenの不動産を変更" name="ChangeLindenEstate"> | ||
1530 | あなたはLinden所有の不動産(メインランド、ティーングリッド、オリエンテーションなど)を変更しようとしています。 | ||
1531 | |||
1532 | これはユーザーの経験を根本から揺るがしかねない「非常に危険な行為」です。これにより、メインランドで多数の地域が変更され、スペースサーバーに悪影響が生じます。 | ||
1533 | |||
1534 | 操作を続行しますか? | ||
1535 | <usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/> | ||
1536 | </notification> | ||
1537 | <notification label="Lindenの不動産へのアクセスを変更" name="ChangeLindenAccess"> | ||
1538 | あなたはLinden所有の不動産(メインランド、ティーングリッド、オリエンテーションなど)へのアクセスリストを変更しようとしています。 | ||
1539 | |||
1540 | この行為は「危険」であり、グリッドからオブジェクトやお金の転送をもたらすハッキングを引き起こす可能性があるため、完全にそれを意図した場合のみ行うべきものです。 | ||
1541 | これにより多数の地域が変更され、スペースサーバーに悪影響が生じます。 | ||
1542 | <usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/> | ||
1543 | </notification> | ||
1544 | <notification label="不動産を選択" name="EstateAllowedAgentAdd"> | 1529 | <notification label="不動産を選択" name="EstateAllowedAgentAdd"> |
1545 | この不動産の許可リストだけに追加しますか? それとも[ALL_ESTATES]のすべての許可リストに追加しますか? | 1530 | この不動産の許可リストだけに追加しますか? それとも[ALL_ESTATES]のすべての許可リストに追加しますか? |
1546 | <usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/> | 1531 | <usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/> |
diff --git a/linden/indra/newview/skins/default/xui/ko/notifications.xml b/linden/indra/newview/skins/default/xui/ko/notifications.xml index cb720ed..20c57a1 100644 --- a/linden/indra/newview/skins/default/xui/ko/notifications.xml +++ b/linden/indra/newview/skins/default/xui/ko/notifications.xml | |||
@@ -2941,43 +2941,7 @@ Applications 폴더에 다운로드하시겠습니까? | |||
2941 | </form> | 2941 | </form> |
2942 | </notification> | 2942 | </notification> |
2943 | 2943 | ||
2944 | <notification | ||
2945 | |||
2946 | label="린든 사유지 변경" | ||
2947 | name="ChangeLindenEstate" | ||
2948 | > | ||
2949 | 귀하께서는 린든 소유의 사유지(메인랜드, 틴 그리드, 오리엔테이션 등)를 | ||
2950 | 변경하려고 합니다. | ||
2951 | |||
2952 | 이렇게 하면 기본적으로 사용자가 게임을 즐기는 데 영향을 | ||
2953 | 줄 수 있으므로 매우 위험합니다. 또한 메인랜드에서 수천가지의 지역이 변경되고 | ||
2954 | 공간 서버가 일시적으로 중단될 수도 있습니다. | ||
2955 | |||
2956 | 계속하시겠습니까? | ||
2957 | <usetemplate | ||
2958 | name="okcancelbuttons" | ||
2959 | notext="취소" | ||
2960 | yestext="사유지 변경"/> | ||
2961 | </notification> | ||
2962 | 2944 | ||
2963 | <notification | ||
2964 | |||
2965 | label="린든 사유지 액세스 변경" | ||
2966 | name="ChangeLindenAccess" | ||
2967 | > | ||
2968 | 귀하께서는 린든 소유의 사유지(메인랜드, 틴 그리드, 오리엔테이션 등)에 대한 | ||
2969 | 접근 목록을 변경하려고 합니다. | ||
2970 | |||
2971 | 이는 위험한 작업이며 오브젝트/금액을 그리드에서 송수신할 수 있도록 | ||
2972 | 핵을 불러내는 경우에만 수행할 수 | ||
2973 | 있습니다. | ||
2974 | 이렇게 하면 수천가지의 지역이 변경되고 | ||
2975 | 공간 서버가 일시적으로 중단될 수도 있습니다. | ||
2976 | <usetemplate | ||
2977 | name="okcancelbuttons" | ||
2978 | notext="취소" | ||
2979 | yestext="사유지 변경"/> | ||
2980 | </notification> | ||
2981 | 2945 | ||
2982 | <notification | 2946 | <notification |
2983 | 2947 | ||
diff --git a/linden/indra/newview/skins/default/xui/pl/notifications.xml b/linden/indra/newview/skins/default/xui/pl/notifications.xml index 38a4b56..4c8ee5c 100644 --- a/linden/indra/newview/skins/default/xui/pl/notifications.xml +++ b/linden/indra/newview/skins/default/xui/pl/notifications.xml | |||
@@ -1434,23 +1434,6 @@ Musisz opuścić przynajmniej jedną grupę żeby przyjąć członkostwo w tej g | |||
1434 | <button name="Cancel" text="Anuluj"/> | 1434 | <button name="Cancel" text="Anuluj"/> |
1435 | </form> | 1435 | </form> |
1436 | </notification> | 1436 | </notification> |
1437 | <notification label="Zmiana Majątku Lindenów" name="ChangeLindenEstate"> | ||
1438 | Dokonujesz zmiany w Regionie Głównym należącym do Lindenów (Regiony Główne, Teen Grid, Orientacja). | ||
1439 | |||
1440 | Żądana operacja jest wyjątkowo niebezpieczna dla wszystkich Rezydentów przebywających w regionie. Dodatkowo, zmiany dokonane w Regionie Głównym mogą spowodować problemy przestrzeni serwerowej innych regionów. | ||
1441 | |||
1442 | Kontynuować? | ||
1443 | <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/> | ||
1444 | </notification> | ||
1445 | <notification label="Zmiana Dostępu do Majątku Lindenów" name="ChangeLindenAccess"> | ||
1446 | Dokonujesz zmiany w liście dostępu Regionu Głównego należącego do Lindenów (Regiony Główne, Teen Grid, Orientacja). | ||
1447 | |||
1448 | Żądana operacja jest wyjątkowo niebezpieczna dla wszystkich Rezydentów przebywających w regionie i powinna być używana wyłącznie w celu zablokowania opcji pozwalającej na przeniesienie obiektów/L$ do/z sieci. | ||
1449 | Dodatkowo, zmiany dokonane w Regionie Głównym mogą spowodować problemy przestrzeni serwerowej innych regionów. | ||
1450 | |||
1451 | Kontynuować? | ||
1452 | <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/> | ||
1453 | </notification> | ||
1454 | <notification label="Wybierz Majątek" name="EstateAllowedAgentAdd"> | 1437 | <notification label="Wybierz Majątek" name="EstateAllowedAgentAdd"> |
1455 | Dodać do listy dostępu do tego majątku czy do [ALL_ESTATES]? | 1438 | Dodać do listy dostępu do tego majątku czy do [ALL_ESTATES]? |
1456 | <usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Wszystkie majątki" yestext="Ten majątek"/> | 1439 | <usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Wszystkie majątki" yestext="Ten majątek"/> |
diff --git a/linden/indra/newview/skins/default/xui/pt/notifications.xml b/linden/indra/newview/skins/default/xui/pt/notifications.xml index 71903c1..a026c59 100644 --- a/linden/indra/newview/skins/default/xui/pt/notifications.xml +++ b/linden/indra/newview/skins/default/xui/pt/notifications.xml | |||
@@ -1434,21 +1434,6 @@ Bate-papo e mensagens instantâneas serão escondidas. Mensagens instantâneas i | |||
1434 | <button name="Cancel" text="Cancelar"/> | 1434 | <button name="Cancel" text="Cancelar"/> |
1435 | </form> | 1435 | </form> |
1436 | </notification> | 1436 | </notification> |
1437 | <notification label="Mudar propriedade Linden" name="ChangeLindenEstate"> | ||
1438 | Você está prestes a mudar uma propriedade pertencente a Linden (continente, teen grid, orientação, etc.) | ||
1439 | |||
1440 | Isto é EXTREMAMENTE PERIGOSO porque pode fundamentalmente afetar a experiência do usuário. No continente, vai mudar milhares de regiões e fazer o spaceserver soluçar. | ||
1441 | |||
1442 | Proceder? | ||
1443 | <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Mudar Propriedade"/> | ||
1444 | </notification> | ||
1445 | <notification label="Mudar o acesso à propriedade Linden" name="ChangeLindenAccess"> | ||
1446 | Você está prestes a mudar a lista de acessos de uma propriedade pertencente a Linden (continente, teen grid, orientação, etc.). | ||
1447 | |||
1448 | Isto é PERIGOSO e deveria ser feito apenas para utilizar uma brecha que permita que objetos/L$ sejam transferidos para dentro/fora da grade. | ||
1449 | Isto mudará milhares de regiões e fará o spaceserver soluçar. | ||
1450 | <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/> | ||
1451 | </notification> | ||
1452 | <notification label="Selecione a propriedade" name="EstateAllowedAgentAdd"> | 1437 | <notification label="Selecione a propriedade" name="EstateAllowedAgentAdd"> |
1453 | Adicionar à lista de permitidos somente para esta propriedade ou para [ALL_ESTATES]? | 1438 | Adicionar à lista de permitidos somente para esta propriedade ou para [ALL_ESTATES]? |
1454 | <usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todas as Propriedades" yestext="Esta Propriedade"/> | 1439 | <usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todas as Propriedades" yestext="Esta Propriedade"/> |
diff --git a/linden/indra/newview/skins/default/xui/ru/notifications.xml b/linden/indra/newview/skins/default/xui/ru/notifications.xml index 0d36371..e0f7740 100644 --- a/linden/indra/newview/skins/default/xui/ru/notifications.xml +++ b/linden/indra/newview/skins/default/xui/ru/notifications.xml | |||
@@ -1452,21 +1452,6 @@ www.secondlife.com/support | |||
1452 | <button name="Cancel" text="Отмена"/> | 1452 | <button name="Cancel" text="Отмена"/> |
1453 | </form> | 1453 | </form> |
1454 | </notification> | 1454 | </notification> |
1455 | <notification label="Изменить участок Линденов" name="ChangeLindenEstate"> | ||
1456 | Вы хотите сменить поместья, принадлежащие Линденам (материк, детский Grid, остров ориентации и т.д.). | ||
1457 | |||
1458 | Это ЧРЕЗВЫЧАЙНО ОПАСНО, потому что это может существенно повлиять на положение вещей. На материке это может изменить тысячи регионов, и испортить работу серверов. | ||
1459 | |||
1460 | Продолжить? | ||
1461 | <usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/> | ||
1462 | </notification> | ||
1463 | <notification label="Изменить доступ к участку Линденов" name="ChangeLindenAccess"> | ||
1464 | Вы хотите сменить поместья, принадлежащие Линденам (материк, детский Grid, остров ориентации и т.д.). | ||
1465 | |||
1466 | Это ЧРЕЗВЫЧАЙНО ОПАСНО и может использоватся только для того, чтобы вызвать методы, позволяющие перемещать объекты/L$ в/из Grid. | ||
1467 | Это может изменить тысячи регионов, и испортить работу серверов. | ||
1468 | <usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/> | ||
1469 | </notification> | ||
1470 | <notification label="Выбрать поместье" name="EstateAllowedAgentAdd"> | 1455 | <notification label="Выбрать поместье" name="EstateAllowedAgentAdd"> |
1471 | Добавить в список разрешенных этого поместья или [ALL_ESTATES]? | 1456 | Добавить в список разрешенных этого поместья или [ALL_ESTATES]? |
1472 | <usetemplate canceltext="Отмена" name="yesnocancelbuttons" notext="Все поместья" yestext="Это поместье"/> | 1457 | <usetemplate canceltext="Отмена" name="yesnocancelbuttons" notext="Все поместья" yestext="Это поместье"/> |
diff --git a/linden/indra/newview/skins/default/xui/uk/notifications.xml b/linden/indra/newview/skins/default/xui/uk/notifications.xml index c7457b3..d207d02 100644 --- a/linden/indra/newview/skins/default/xui/uk/notifications.xml +++ b/linden/indra/newview/skins/default/xui/uk/notifications.xml | |||
@@ -1436,21 +1436,6 @@ www.secondlife.com/support | |||
1436 | <button name="Cancel" text="Відміна"/> | 1436 | <button name="Cancel" text="Відміна"/> |
1437 | </form> | 1437 | </form> |
1438 | </notification> | 1438 | </notification> |
1439 | <notification label="Змінити ділянку Лінденів" name="ChangeLindenEstate"> | ||
1440 | Ви хочете змінити маєтки, що належать Лінденам (материк, дитячий Grid, остров орієнтації і т.д.). | ||
1441 | |||
1442 | Це НАДЗВИЧАЙНО НЕБЕЗПЕЧНО, тому що це може суттєво вплинути на стан речей. На материку це може змінити тисячі регіонів, і зіпсувати роботу серверів. | ||
1443 | |||
1444 | Продовжити? | ||
1445 | <usetemplate name="okcancelbuttons" notext="Відміна" yestext="OK"/> | ||
1446 | </notification> | ||
1447 | <notification label="Змінити доступ до ділянки Лінденів" name="ChangeLindenAccess"> | ||
1448 | Ви хочете змінити маєтки, що належать Лінденам (материк, дитячий Grid, остров орієнтації і т.д.). | ||
1449 | |||
1450 | Це НАДЗВИЧАЙНО НЕБЕЗПЕЧНО і може використовуватися тільки для того, щоб викликати методи, що дозволять переміщати об'єкти/L$ в/з Grid. | ||
1451 | Це може змінити тисячі регіонів, і зіпсувати роботу серверів. | ||
1452 | <usetemplate name="okcancelbuttons" notext="Відміна" yestext="OK"/> | ||
1453 | </notification> | ||
1454 | <notification label="Обрати маєток" name="EstateAllowedAgentAdd"> | 1439 | <notification label="Обрати маєток" name="EstateAllowedAgentAdd"> |
1455 | Додати в список дозволених цього маєтку або [ALL_ESTATES]? | 1440 | Додати в список дозволених цього маєтку або [ALL_ESTATES]? |
1456 | <usetemplate canceltext="Відміна" name="yesnocancelbuttons" notext="Всі маєтки" yestext="Цей маєток"/> | 1441 | <usetemplate canceltext="Відміна" name="yesnocancelbuttons" notext="Всі маєтки" yestext="Цей маєток"/> |
diff --git a/linden/indra/newview/skins/default/xui/zh/notifications.xml b/linden/indra/newview/skins/default/xui/zh/notifications.xml index acbb18b..415e5e7 100644 --- a/linden/indra/newview/skins/default/xui/zh/notifications.xml +++ b/linden/indra/newview/skins/default/xui/zh/notifications.xml | |||
@@ -1538,29 +1538,6 @@ www.secondlife.com/support | |||
1538 | <button name="OK" text="确定"/> | 1538 | <button name="OK" text="确定"/> |
1539 | </form> | 1539 | </form> |
1540 | </notification> | 1540 | </notification> |
1541 | <notification label="更改林登地产" name="ChangeLindenEstate"> | ||
1542 | 你将要更改林登所有的地产(大陆、 | ||
1543 | 少年网格、方位岛,等等)。 | ||
1544 | |||
1545 | 这个动作极度危险,因为它可能会在基础的层次上 | ||
1546 | 影响到用户体验。在大陆上, 它将改变 | ||
1547 | 上千的区域,并会使空间服务器噎着。 | ||
1548 | |||
1549 | 是否继续? | ||
1550 | <usetemplate name="okcancelbuttons" notext="取消" yestext="更改不动产"/> | ||
1551 | </notification> | ||
1552 | <notification label="更改林登地产准入列表" name="ChangeLindenAccess"> | ||
1553 | 你将要更改林登所有的地产的准入列表(大陆、 | ||
1554 | 少年网格、方位岛,等等)。 | ||
1555 | |||
1556 | 该操作非常危险, 应该仅在利用把物体/金钱 | ||
1557 | 转移进或出某个网格的对付活儿 (hack) 时候 | ||
1558 | 才应该被执行。 它将改变上千的区域,并会 | ||
1559 | 使空间服务器噎着。 | ||
1560 | |||
1561 | 是否继续? | ||
1562 | <usetemplate name="okcancelbuttons" notext="取消" yestext="更改不动产"/> | ||
1563 | </notification> | ||
1564 | <notification label="选择地产" name="EstateAllowedAgentAdd"> | 1541 | <notification label="选择地产" name="EstateAllowedAgentAdd"> |
1565 | 仅列入此地产还是[ALL_ESTATES]的允许名单? | 1542 | 仅列入此地产还是[ALL_ESTATES]的允许名单? |
1566 | <usetemplate canceltext="取消" name="yesnocancelbuttons" notext="所有地产" yestext="该地产"/> | 1543 | <usetemplate canceltext="取消" name="yesnocancelbuttons" notext="所有地产" yestext="该地产"/> |