From f31cb4c790de84e297ced3045f33a7ba6dc85521 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Wed, 5 Oct 2011 15:15:49 -0400 Subject: storm-1581 (partial): reset graphics only when GPU id changes, not class, and provide better explanation in the alert message --- indra/newview/app_settings/settings.xml | 6 +++--- indra/newview/llstartup.cpp | 14 +++++++++----- indra/newview/llviewerwindow.cpp | 2 +- indra/newview/skins/default/xui/en/notifications.xml | 9 +++++++++ 4 files changed, 22 insertions(+), 9 deletions(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 15f1bbd1b1..cc27bcce3a 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4589,16 +4589,16 @@ Value 1 - LastGPUClass + LastGPUString Comment [DO NOT MODIFY] previous GPU class for tracking hardware changes Persist 1 Type - S32 + String Value - -1 + LastFeatureVersion diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 749acea6c1..18aa14a15c 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -367,7 +367,9 @@ bool idle_startup() // // Initialize stuff that doesn't need data from simulators // - + std::string lastGPU = gSavedSettings.getString("LastGPUString"); + std::string thisGPU = LLFeatureManager::getInstance()->getGPUString(); + if (LLFeatureManager::getInstance()->isSafe()) { LLNotificationsUtil::add("DisplaySetToSafe"); @@ -377,10 +379,12 @@ bool idle_startup() { LLNotificationsUtil::add("DisplaySetToRecommended"); } - else if ((gSavedSettings.getS32("LastGPUClass") != LLFeatureManager::getInstance()->getGPUClass()) && - (gSavedSettings.getS32("LastGPUClass") != -1)) + else if ( ! lastGPU.empty() && (lastGPU != thisGPU)) { - LLNotificationsUtil::add("DisplaySetToRecommended"); + LLSD subs; + subs["LAST_GPU"] = lastGPU; + subs["THIS_GPU"] = thisGPU; + LLNotificationsUtil::add("DisplaySetToRecommendedGPUChange", subs); } else if (!gViewerWindow->getInitAlert().empty()) { @@ -396,7 +400,7 @@ bool idle_startup() LLStartUp::startLLProxy(); gSavedSettings.setS32("LastFeatureVersion", LLFeatureManager::getInstance()->getVersion()); - gSavedSettings.setS32("LastGPUClass", LLFeatureManager::getInstance()->getGPUClass()); + gSavedSettings.setString("LastGPUString", thisGPU); // load dynamic GPU/feature tables from website (S3) LLFeatureManager::getInstance()->fetchHTTPTables(); diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 98ae746ca7..59fe5e870c 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1651,7 +1651,7 @@ LLViewerWindow::LLViewerWindow( if (LLFeatureManager::getInstance()->isSafe() || (gSavedSettings.getS32("LastFeatureVersion") != LLFeatureManager::getInstance()->getVersion()) - || (gSavedSettings.getS32("LastGPUClass") != LLFeatureManager::getInstance()->getGPUClass()) + || (gSavedSettings.getString("LastGPUString") != LLFeatureManager::getInstance()->getGPUString()) || (gSavedSettings.getBOOL("ProbeHardwareOnStartup"))) { LLFeatureManager::getInstance()->applyRecommendedSettings(); diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 41a90f5984..1d5f9e731a 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -2663,6 +2663,15 @@ Deed this [AREA] m² of land to the group '[GROUP_NAME]'? Display settings have been set to safe levels because you have specified the -safe option. + +Display settings have been set to recommended levels because your graphics card changed +from '[LAST_GPU]' +to '[THIS_GPU]' + + Date: Fri, 7 Oct 2011 11:28:37 -0400 Subject: Duplicated XUI ID: floater_model_wizard.xml --- doc/contributions.txt | 1 + indra/newview/skins/default/xui/en/floater_model_wizard.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/contributions.txt b/doc/contributions.txt index bcdc5a63d2..f8f802548a 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -575,6 +575,7 @@ Jonathan Yap STORM-1567 STORM-1572 STORM-1574 + STORM-1638 Kadah Coba STORM-1060 Jondan Lundquist diff --git a/indra/newview/skins/default/xui/en/floater_model_wizard.xml b/indra/newview/skins/default/xui/en/floater_model_wizard.xml index b5a5ff5342..9c0af7d9ba 100644 --- a/indra/newview/skins/default/xui/en/floater_model_wizard.xml +++ b/indra/newview/skins/default/xui/en/floater_model_wizard.xml @@ -199,7 +199,7 @@ height="10" layout="topleft" left="10" - name="Cache location" + name="Model types" width="320"> Second Life supports COLLADA (.dae) files -- cgit v1.2.3 From 02e1578365627b3be265fa733f1206897c51ee77 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 7 Oct 2011 14:38:00 -0400 Subject: storm-1581: modify feature table rules to increment version only when the intent is to reset all graphics preferences --- indra/newview/app_settings/settings.xml | 4 ++-- indra/newview/featuretable.txt | 4 ++++ indra/newview/featuretable_linux.txt | 4 ++++ indra/newview/featuretable_mac.txt | 4 ++++ indra/newview/featuretable_solaris.txt | 4 ++++ indra/newview/featuretable_xp.txt | 4 ++++ indra/newview/llstartup.cpp | 2 +- indra/newview/skins/default/xui/en/notifications.xml | 4 ++-- 8 files changed, 25 insertions(+), 5 deletions(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index cc27bcce3a..dd94d293c4 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4592,7 +4592,7 @@ LastGPUString Comment - [DO NOT MODIFY] previous GPU class for tracking hardware changes + [DO NOT MODIFY] previous GPU id string for tracking hardware changes Persist 1 Type @@ -4603,7 +4603,7 @@ LastFeatureVersion Comment - [DO NOT MODIFY] Version number for tracking hardware changes + [DO NOT MODIFY] Feature Table Version number for tracking rendering system changes Persist 1 Type diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt index e12c2f7853..9ad313a9a7 100755 --- a/indra/newview/featuretable.txt +++ b/indra/newview/featuretable.txt @@ -1,4 +1,8 @@ version 32 +// The version number above should be implemented IF AND ONLY IF some +// change has been made that is sufficiently important to justify +// resetting the graphics preferences of all users to the recommended +// defaults. This should be as rare an event as we can manage. // NOTE: This is mostly identical to featuretable_mac.txt with a few differences // Should be combined into one table diff --git a/indra/newview/featuretable_linux.txt b/indra/newview/featuretable_linux.txt index 6e962f3c56..2dbdf3a76e 100644 --- a/indra/newview/featuretable_linux.txt +++ b/indra/newview/featuretable_linux.txt @@ -1,4 +1,8 @@ version 27 +// The version number above should be implemented IF AND ONLY IF some +// change has been made that is sufficiently important to justify +// resetting the graphics preferences of all users to the recommended +// defaults. This should be as rare an event as we can manage. // NOTE: This is mostly identical to featuretable_mac.txt with a few differences // Should be combined into one table diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt index 2690e8ec70..996e574350 100644 --- a/indra/newview/featuretable_mac.txt +++ b/indra/newview/featuretable_mac.txt @@ -1,4 +1,8 @@ version 30 +// The version number above should be implemented IF AND ONLY IF some +// change has been made that is sufficiently important to justify +// resetting the graphics preferences of all users to the recommended +// defaults. This should be as rare an event as we can manage. // NOTE: This is mostly identical to featuretable_mac.txt with a few differences // Should be combined into one table diff --git a/indra/newview/featuretable_solaris.txt b/indra/newview/featuretable_solaris.txt index 7df75687f2..e7cae1abdc 100644 --- a/indra/newview/featuretable_solaris.txt +++ b/indra/newview/featuretable_solaris.txt @@ -1,4 +1,8 @@ version 15 +// The version number above should be implemented IF AND ONLY IF some +// change has been made that is sufficiently important to justify +// resetting the graphics preferences of all users to the recommended +// defaults. This should be as rare an event as we can manage. // NOTE: This is mostly identical to featuretable.txt with a few differences // Should be combined into one table diff --git a/indra/newview/featuretable_xp.txt b/indra/newview/featuretable_xp.txt index a0245f5369..a53be10be1 100644 --- a/indra/newview/featuretable_xp.txt +++ b/indra/newview/featuretable_xp.txt @@ -1,4 +1,8 @@ version 31 +// The version number above should be implemented IF AND ONLY IF some +// change has been made that is sufficiently important to justify +// resetting the graphics preferences of all users to the recommended +// defaults. This should be as rare an event as we can manage. // NOTE: This is mostly identical to featuretable_mac.txt with a few differences // Should be combined into one table diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 18aa14a15c..ab2c5d7ad5 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -377,7 +377,7 @@ bool idle_startup() else if ((gSavedSettings.getS32("LastFeatureVersion") < LLFeatureManager::getInstance()->getVersion()) && (gSavedSettings.getS32("LastFeatureVersion") != 0)) { - LLNotificationsUtil::add("DisplaySetToRecommended"); + LLNotificationsUtil::add("DisplaySetToRecommendedFeatureChange"); } else if ( ! lastGPU.empty() && (lastGPU != thisGPU)) { diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 1d5f9e731a..03181d79cd 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -2674,9 +2674,9 @@ to '[THIS_GPU]' -Display settings have been set to recommended levels based on your system configuration. +Display settings have been set to recommended levels because of a change to the rendering subsystem. Date: Tue, 11 Oct 2011 18:18:02 -0400 Subject: STORM-976 Object muted by name still displays notification message when clicked --- doc/contributions.txt | 1 + indra/newview/llviewermessage.cpp | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/contributions.txt b/doc/contributions.txt index 693d4c37b8..c60e91c9e7 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -576,6 +576,7 @@ Jonathan Yap STORM-1567 STORM-1572 STORM-1574 + STORM-976 Kadah Coba STORM-1060 Jondan Lundquist diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 74ee918bfe..8f3163c0cf 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -1809,8 +1809,11 @@ void LLOfferInfo::initRespondFunctionMap() void inventory_offer_handler(LLOfferInfo* info) { - //If muted, don't even go through the messaging stuff. Just curtail the offer here. - if (LLMuteList::getInstance()->isMuted(info->mFromID, info->mFromName)) + // If muted, don't even go through the messaging stuff. Just curtail the offer here. + // Passing in a null UUID handles the case of where you have muted one of your own objects by_name. + // The solution for STORM-1297 seems to handle the cases where the object is owned by someone else. + if (LLMuteList::getInstance()->isMuted(info->mFromID, info->mFromName) || + LLMuteList::getInstance()->isMuted(LLUUID::null, info->mFromName)) { info->forceResponse(IOR_MUTE); return; -- cgit v1.2.3 From 04eb6f0ef4e5b00103ea9f2b011ca709be8a1ef2 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Fri, 14 Oct 2011 17:55:04 -0400 Subject: STORM-910 Text formatting issues in Land/Assets accordion --- doc/contributions.txt | 3 ++- indra/newview/llpanelgrouplandmoney.cpp | 5 +++-- indra/newview/skins/default/xui/en/panel_group_land_money.xml | 1 + indra/newview/skins/default/xui/en/strings.xml | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/doc/contributions.txt b/doc/contributions.txt index e85fc32f18..00fea501f0 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -578,8 +578,9 @@ Jonathan Yap STORM-1574 STORM-1579 STORM-1639 + STORM-910 Kadah Coba - STORM-1060 + STORM-1060 Jondan Lundquist Josef Munster Josette Windlow diff --git a/indra/newview/llpanelgrouplandmoney.cpp b/indra/newview/llpanelgrouplandmoney.cpp index eddd6e554d..8477219f87 100644 --- a/indra/newview/llpanelgrouplandmoney.cpp +++ b/indra/newview/llpanelgrouplandmoney.cpp @@ -1435,6 +1435,7 @@ void LLGroupMoneyPlanningTabEventHandler::processReply(LLMessageSystem* msg, LLStringUtil::format (time_str, substitution); text.append(time_str); + text.append(". "); if (current_interval == 0) { @@ -1445,8 +1446,8 @@ void LLGroupMoneyPlanningTabEventHandler::processReply(LLMessageSystem* msg, LLStringUtil::format (time_str, substitution); text.append(time_str); - text.append("\n\n"); - text.append(llformat("%-24sL$%6d\n", LLTrans::getString("GroupMoneyBalance").c_str(), balance )); + text.append(".\n\n"); + text.append(llformat("%-23sL$%6d\n", LLTrans::getString("GroupMoneyBalance").c_str(), balance )); text.append(1, '\n'); } diff --git a/indra/newview/skins/default/xui/en/panel_group_land_money.xml b/indra/newview/skins/default/xui/en/panel_group_land_money.xml index eff674c628..d4da55e32e 100644 --- a/indra/newview/skins/default/xui/en/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/en/panel_group_land_money.xml @@ -272,6 +272,7 @@ top="0" width="313"> [mthnum,datetime,utc]/[day,datetime,utc]/[year,datetime,utc] - + Balance Credits Debits -- cgit v1.2.3 From 9cb8e959af89c16b083bf80baecb1bc98d33c1f4 Mon Sep 17 00:00:00 2001 From: Vex Streeter Date: Fri, 14 Oct 2011 20:49:46 -0400 Subject: STORM-1642 Typos in keywords.ini With repo-making help from Jonathan Yap --- doc/contributions.txt | 2 + indra/newview/app_settings/keywords.ini | 82 ++++++++++++++++----------------- 2 files changed, 43 insertions(+), 41 deletions(-) diff --git a/doc/contributions.txt b/doc/contributions.txt index e85fc32f18..93c9211e2e 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -578,6 +578,7 @@ Jonathan Yap STORM-1574 STORM-1579 STORM-1639 + STORM-1642 Kadah Coba STORM-1060 Jondan Lundquist @@ -1137,6 +1138,7 @@ Vector Hastings VWR-8726 Veritas Raymaker Vex Streeter + STORM-1642 Viaticus Speculaas Vick Forcella Villain Baroque diff --git a/indra/newview/app_settings/keywords.ini b/indra/newview/app_settings/keywords.ini index 9fa4046fdf..b5f105439c 100644 --- a/indra/newview/app_settings/keywords.ini +++ b/indra/newview/app_settings/keywords.ini @@ -10,7 +10,7 @@ state Keyword to indicate state block or state transition integer Integer type float Floating-point type string String type -key Key type. Use NULL_KEY to test for empty keys. +key Key type. Use NULL_KEY to test for empty keys vector Vector type of 3 floats. Used to represent 3D motion, Euler angles, and color.:Access components by .x, .y. or .z rotation Rotation type of 4 floats. Used to represent rotation.:Access components by .x, .y., .z, or .w list List of various data types @@ -28,7 +28,7 @@ collision_end collision_end(integer num_detected):Triggered when task stops coll land_collision_start land_collision_start(vector pos):Triggered when task starts colliding with land land_collision land_collision(vector pos):Triggered when task is colliding with land land_collision_end land_collision_end(vector pos):Triggered when task stops colliding with land -timer timer():Result of the llSetTimerEvent library function call. +timer timer():Result of the llSetTimerEvent library function call listen listen(integer channel, string name, key id, string message):Result of the llListen library function call sensor sensor(integer num_detected):Result of the llSensor library function call no_sensor no_sensor():Result of the llSensor library function call @@ -44,8 +44,8 @@ attach attach(key id):Triggered when task attaches or detaches from agent dataserver dataserver(key queryid, string data):Triggered when task receives asynchronous data moving_start moving_start():Triggered when task begins moving moving_end moving_end():Triggered when task stops moving -on_rez on_rez(integer start_param):Triggered when task is rezed in from inventory or another task -object_rez object_rez(key id):Triggered when task rezes in another task +on_rez on_rez(integer start_param):Triggered when task is rezzed in from inventory or another task +object_rez object_rez(key id):Triggered when task rezzes in another task link_message link_message(integer sender_num, integer num, string str, key id):Triggered when task receives a link message via LLMessageLinked library function call changed changed( integer change ):Triggered various event change the task:(test change with CHANGED_INVENTORY, CHANGED_COLOR, CHANGED_SHAPE, CHANGED_SCALE, CHANGED_TEXTURE, CHANGED_LINK, CHANGED_ALLOWED_DROP, CHANGED_OWNER, CHANGED_REGION, CHANGED_TELEPORT, CHANGED_REGION_START, CHANGED_MEDIA) remote_data remote_data(integer event_type, key channel, key message_id, string sender,integer idata, string sdata):Triggered by various XML-RPC calls (event_type will be one of REMOTE_DATA_CHANNEL, REMOTE_DATA_REQUEST, REMOTE_DATA_REPLY) @@ -151,15 +151,15 @@ PSYS_SRC_PATTERN_ANGLE PSYS_SRC_PATTERN_ANGLE_CONE PSYS_SRC_PATTERN_ANGLE_CONE_EMPTY -OBJECT_UNKNOWN_DETAIL Returned by llGetObjectDetails when passed an invalid object parameter type. -OBJECT_NAME Used with llGetObjectDetails to get an object's name. -OBJECT_DESC Used with llGetObjectDetails to get an object's description. -OBJECT_POS Used with llGetObjectDetails to get an object's position. -OBJECT_ROT Used with llGetObjectDetails to get an object's rotation. -OBJECT_VELOCITY Used with llGetObjectDetails to get an object's velocity. -OBJECT_OWNER Used with llGetObjectDetails to get an object's owner's key. Will be NULL_KEY if group owned. -OBJECT_GROUP Used with llGetObjectDetails to get an object's group's key. -OBJECT_CREATOR Used with llGetObjectDetails to get an object's creator's key. +OBJECT_UNKNOWN_DETAIL Returned by llGetObjectDetails when passed an invalid object parameter type +OBJECT_NAME Used with llGetObjectDetails to get an object's name +OBJECT_DESC Used with llGetObjectDetails to get an object's description +OBJECT_POS Used with llGetObjectDetails to get an object's position +OBJECT_ROT Used with llGetObjectDetails to get an object's rotation +OBJECT_VELOCITY Used with llGetObjectDetails to get an object's velocity +OBJECT_OWNER Used with llGetObjectDetails to get an object's owner's key. Will be NULL_KEY if group owned +OBJECT_GROUP Used with llGetObjectDetails to get an object's group's key +OBJECT_CREATOR Used with llGetObjectDetails to get an object's creator's key # some vehicle params VEHICLE_TYPE_NONE @@ -198,7 +198,7 @@ VEHICLE_VERTICAL_ATTRACTION_EFFICIENCY A slider between 0 (bouncy) and 1 (critic VEHICLE_VERTICAL_ATTRACTION_TIMESCALE The exponential timescale for the vehicle to align its z-axis to the world z-axis (vertical) VEHICLE_BANKING_EFFICIENCY A slider between -1 (leans out of turns), 0 (no banking), and +1 (leans into turns) -VEHICLE_BANKING_MIX A slider betwen 0 (static banking) and 1 (dynamic banking) +VEHICLE_BANKING_MIX A slider between 0 (static banking) and 1 (dynamic banking) VEHICLE_BANKING_TIMESCALE The exponential timescale for the banking behavior to take full effect VEHICLE_FLAG_NO_DEFLECTION_UP Prevents linear deflection along world-z axis @@ -208,9 +208,9 @@ VEHICLE_FLAG_HOVER_TERRAIN_ONLY Hover only pays attention to terrain height VEHICLE_FLAG_HOVER_GLOBAL_HEIGHT Hover only pays attention to global height VEHICLE_FLAG_HOVER_UP_ONLY Hover only pushes up VEHICLE_FLAG_LIMIT_MOTOR_UP Prevents ground vehicles from motoring into the sky -VEHICLE_FLAG_MOUSELOOK_STEER Makes vehicle try to turn toward mouselook direction. -VEHICLE_FLAG_MOUSELOOK_BANK Makes vehicle try to turn toward mouselook direction assuming banking is enabled. -VEHICLE_FLAG_CAMERA_DECOUPLED Causes the camera look-at axis to NOT move when the vehicle rotates. +VEHICLE_FLAG_MOUSELOOK_STEER Makes vehicle try to turn toward mouselook direction +VEHICLE_FLAG_MOUSELOOK_BANK Makes vehicle try to turn toward mouselook direction assuming banking is enabled +VEHICLE_FLAG_CAMERA_DECOUPLED Causes the camera look-at axis to NOT move when the vehicle rotates CAMERA_PITCH (-45 to 80) (Adjusts the angular amount that the camera aims straight ahead vs. straight down, maintaining the same distance. Analogous to 'incidence'.") CAMERA_FOCUS_OFFSET (-10 to 10) A vector that adjusts the position of the camera focus position relative to the subject @@ -238,7 +238,7 @@ INVENTORY_BODYPART Passed to task inventory library functions to reference body INVENTORY_ANIMATION Passed to task inventory library functions to reference animations INVENTORY_GESTURE Passed to task inventory library functions to reference gestures INVENTORY_ALL Passed to task inventory library functions to reference all inventory items -INVENTORY_NONE Returned by llGetInventoryType when no item is found. +INVENTORY_NONE Returned by llGetInventoryType when no item is found ATTACH_CHEST Passed to llAttachToAvatar to attach task to chest ATTACH_HEAD Passed to llAttachToAvatar to attach task to head @@ -256,7 +256,7 @@ ATTACH_LEAR Passed to llAttachToAvatar to attach task to left ear ATTACH_REAR Passed to llAttachToAvatar to attach task to right ear ATTACH_LEYE Passed to llAttachToAvatar to attach task to left eye ATTACH_REYE Passed to llAttachToAvatar to attach task to right eye -ATTACH_NOSE Passed to llAttachToAvatar to attach task to noce +ATTACH_NOSE Passed to llAttachToAvatar to attach task to nose ATTACH_RUARM Passed to llAttachToAvatar to attach task to right upper arm ATTACH_RLARM Passed to llAttachToAvatar to attach task to right lower arm ATTACH_LUARM Passed to llAttachToAvatar to attach task to left upper arm @@ -296,7 +296,7 @@ PAYMENT_INFO_USED Used with llRequestAgentData to tell if Agent is of "Payment I ANIM_ON Enable texture animation LOOP Loop when animating textures REVERSE Animate in the reverse direction -PING_PONG Animate forward, then reverse. +PING_PONG Animate forward, then reverse SMOOTH Textures slides, instead of stepping ROTATE Rotates the texture, instead of using frames SCALE Scales the texture, instead of using frames @@ -343,7 +343,7 @@ PRIM_FLEXIBLE Followed by TRUE or FALSE, integer softness, float gravity, float PRIM_POINT_LIGHT Followed by TRUE or FALSE, vector color, float intensity, float radius, float falloff PRIM_TEMP_ON_REZ Sets temporay on rez to TRUE or FALSE PRIM_PHANTOM Sets phantom to TRUE or FALSE -PRIM_CAST_SHADOWS DEPRECATED. Takes 1 parameter, an integer, but has no effect when set and always returns 0 if used in llGetPrimitiveParams. +PRIM_CAST_SHADOWS DEPRECATED. Takes 1 parameter, an integer, but has no effect when set and always returns 0 if used in llGetPrimitiveParams PRIM_POSITION Sets primitive position to a vector position PRIM_SIZE Sets primitive size to a vector size PRIM_ROTATION Sets primitive rotation @@ -363,10 +363,10 @@ PRIM_TYPE_TUBE Followed by integer hole shape, vector cut, float hollow, vector PRIM_TYPE_RING Followed by integer hole shape, vector cut, float hollow, vector twist,:vector hole size, vector top shear, vector advanced cut, vector taper,:float revolutions, float radius offset, and float skew PRIM_TYPE_SCULPT Followed by a key/string texture uuid, and one of PRIM_SCULPT_TYPE_SPHERE, PRIM_SCULPT_TYPE_TORUS, PRIM_SCULPT_TYPE_PLANE, or PRIM_SCULPT_TYPE_CYLINDER -PRIM_HOLE_DEFAULT Sets hole type to match the prim type. -PRIM_HOLE_SQUARE Sets hole type to square. -PRIM_HOLE_CIRCLE Sets hole type to circle. -PRIM_HOLE_TRIANGLE Sets hole type to triangle. +PRIM_HOLE_DEFAULT Sets hole type to match the prim type +PRIM_HOLE_SQUARE Sets hole type to square +PRIM_HOLE_CIRCLE Sets hole type to circle +PRIM_HOLE_TRIANGLE Sets hole type to triangle PRIM_MATERIAL_STONE Sets material to stone PRIM_MATERIAL_METAL Sets material to metal @@ -436,7 +436,7 @@ PARCEL_MEDIA_COMMAND_TIME Set media stream to specific time PARCEL_MEDIA_COMMAND_SIZE Get or set the parcel's media pixel resolution PARCEL_MEDIA_COMMAND_AGENT Allows media stream commands to apply to only one agent PARCEL_MEDIA_COMMAND_UNLOAD Unloads the media stream -PARCEL_MEDIA_COMMAND_AUTO_ALIGN Auto aligns the media stream to the texture size. May cause a performance hit and loss of some visual quality. +PARCEL_MEDIA_COMMAND_AUTO_ALIGN Auto aligns the media stream to the texture size. May cause a performance hit and loss of some visual quality PAY_HIDE Used with llSetPayPrice to hide a button PAY_DEFAULT Used with llSetPayPrice to use the default price for a button @@ -481,7 +481,7 @@ REGION_FLAG_RESTRICT_PUSHOBJECT Used with llGetRegionFlags to find if a region HTTP_METHOD Used with llHTTPRequest to specify the method, such as "GET" or "POST" HTTP_MIMETYPE Used with llHTTPRequest to specify the MIME type, defaults to "text/plain" -HTTP_BODY_MAXLENGTH Used with llHTTPRequest to specify the maxium reponse body to return +HTTP_BODY_MAXLENGTH Used with llHTTPRequest to specify the maximum response body to return HTTP_VERIFY_CERT Used with llHTTPRequest to specify SSL certificate verification HTTP_BODY_TRUNCATED Used with http_response to indicate truncation point in bytes @@ -492,17 +492,17 @@ PARCEL_COUNT_OTHER Used with llGetParcelPrimCount to get the number of prims on PARCEL_COUNT_SELECTED Used with llGetParcelPrimCount to get the number of prims on the parcel currently selected or sat upon PARCEL_COUNT_TEMP Used with llGetParcelPrimCount to get the number of prims on the parcel that are temp on rez -PARCEL_DETAILS_NAME Used with llGetParcelDetails to get the parcel name. -PARCEL_DETAILS_DESC Used with llGetParcelDetails to get the parcel description. -PARCEL_DETAILS_OWNER Used with llGetParcelDetails to get the parcel owner id. -PARCEL_DETAILS_GROUP Used with llGetParcelDetails to get the parcel group id. -PARCEL_DETAILS_AREA Used with llGetParcelDetails to get the parcel area in square meters. -PARCEL_DETAILS_ID Used with llGetParcelDetails to get the parcel id. -PARCEL_DETAILS_SEE_AVATARS Used with llGetParcelDetails to get the avatars visibility setting. +PARCEL_DETAILS_NAME Used with llGetParcelDetails to get the parcel name +PARCEL_DETAILS_DESC Used with llGetParcelDetails to get the parcel description +PARCEL_DETAILS_OWNER Used with llGetParcelDetails to get the parcel owner id +PARCEL_DETAILS_GROUP Used with llGetParcelDetails to get the parcel group id +PARCEL_DETAILS_AREA Used with llGetParcelDetails to get the parcel area in square meters +PARCEL_DETAILS_ID Used with llGetParcelDetails to get the parcel id +PARCEL_DETAILS_SEE_AVATARS Used with llGetParcelDetails to get the avatars visibility setting -STRING_TRIM_HEAD Used with llStringTrim to trim leading spaces from a string. -STRING_TRIM_TAIL Used with llStringTrim to trim trailing spaces from a string. -STRING_TRIM Used with llStringTrim to trim both leading and trailing spaces from a string. +STRING_TRIM_HEAD Used with llStringTrim to trim leading spaces from a string +STRING_TRIM_TAIL Used with llStringTrim to trim trailing spaces from a string +STRING_TRIM Used with llStringTrim to trim both leading and trailing spaces from a string CLICK_ACTION_NONE Used with llSetClickAction to disable the click action CLICK_ACTION_TOUCH Used with llSetClickAction to set touch as the default action when object is clicked @@ -514,9 +514,9 @@ CLICK_ACTION_PLAY Used with llSetClickAction to set play as the default ac CLICK_ACTION_OPEN_MEDIA Used with llSetClickAction to set open-media as the default action when object is clicked CLICK_ACTION_ZOOM Used with llSetClickAction to set zoom in as the default action when object is clicked -TOUCH_INVALID_TEXCOORD Value returned by llDetectedTouchUV() and llDetectedTouchST() when the touch position is not valid. -TOUCH_INVALID_VECTOR Value returned by llDetectedTouchPos(), llDetectedTouchNormal(), and llDetectedTouchBinormal() when the touch position is not valid. -TOUCH_INVALID_FACE Value returned by llDetectedTouchFace() when the touch position is not valid. +TOUCH_INVALID_TEXCOORD Value returned by llDetectedTouchUV() and llDetectedTouchST() when the touch position is not valid +TOUCH_INVALID_VECTOR Value returned by llDetectedTouchPos(), llDetectedTouchNormal(), and llDetectedTouchBinormal() when the touch position is not valid +TOUCH_INVALID_FACE Value returned by llDetectedTouchFace() when the touch position is not valid PRIM_MEDIA_ALT_IMAGE_ENABLE Used with ll{Get,Set}PrimMediaParams to enable the default alt image for media PRIM_MEDIA_CONTROLS Used with ll{Get,Set}PrimMediaParams to determine the controls shown for media @@ -608,4 +608,4 @@ return Leave current function or event handler [two_sided_delimiter 0, .2, 0] " String literal -#functions are supplied by the program now. +#functions are supplied by the program now -- cgit v1.2.3 From 66a46d6f0440384b6f37e53d2a8fea5db1043d14 Mon Sep 17 00:00:00 2001 From: eli Date: Tue, 18 Oct 2011 16:26:18 -0700 Subject: sync with viewer-development --- .../default/xui/da/panel_preferences_chat.xml | 2 +- .../default/xui/de/panel_preferences_chat.xml | 2 +- .../default/xui/de/panel_preferences_general.xml | 1 - .../default/xui/en/panel_preferences_chat.xml | 2 +- .../default/xui/en/panel_preferences_general.xml | 20 +- .../default/xui/es/panel_preferences_chat.xml | 2 +- .../default/xui/es/panel_preferences_general.xml | 1 - .../default/xui/fr/panel_preferences_chat.xml | 2 +- .../default/xui/fr/panel_preferences_general.xml | 1 - .../default/xui/it/panel_preferences_chat.xml | 2 +- .../default/xui/it/panel_preferences_general.xml | 1 - .../default/xui/ja/panel_preferences_chat.xml | 2 +- .../default/xui/ja/panel_preferences_general.xml | 1 - .../newview/skins/default/xui/nl/floater_about.xml | 81 - .../skins/default/xui/nl/floater_about_land.xml | 488 --- .../default/xui/nl/floater_animation_preview.xml | 85 - .../skins/default/xui/nl/floater_auction.xml | 9 - .../skins/default/xui/nl/floater_avatar_picker.xml | 42 - .../default/xui/nl/floater_avatar_textures.xml | 30 - .../skins/default/xui/nl/floater_beacons.xml | 15 - .../skins/default/xui/nl/floater_build_options.xml | 8 - .../skins/default/xui/nl/floater_bulk_perms.xml | 44 - .../newview/skins/default/xui/nl/floater_bumps.xml | 21 - .../skins/default/xui/nl/floater_buy_contents.xml | 21 - .../skins/default/xui/nl/floater_buy_currency.xml | 68 - .../skins/default/xui/nl/floater_buy_land.xml | 235 -- .../skins/default/xui/nl/floater_buy_object.xml | 26 - .../skins/default/xui/nl/floater_camera.xml | 16 - .../skins/default/xui/nl/floater_choose_group.xml | 8 - .../skins/default/xui/nl/floater_color_picker.xml | 31 - .../skins/default/xui/nl/floater_critical.xml | 11 - .../newview/skins/default/xui/nl/floater_event.xml | 40 - .../skins/default/xui/nl/floater_font_test.xml | 6 - .../skins/default/xui/nl/floater_gesture.xml | 15 - .../default/xui/nl/floater_hardware_settings.xml | 28 - indra/newview/skins/default/xui/nl/floater_hud.xml | 2 - .../skins/default/xui/nl/floater_image_preview.xml | 33 - .../skins/default/xui/nl/floater_inspect.xml | 11 - .../skins/default/xui/nl/floater_inventory.xml | 47 - .../xui/nl/floater_inventory_item_properties.xml | 75 - .../xui/nl/floater_inventory_view_finder.xml | 24 - .../skins/default/xui/nl/floater_joystick.xml | 80 - .../skins/default/xui/nl/floater_lagmeter.xml | 152 - .../skins/default/xui/nl/floater_land_holdings.xml | 39 - .../default/xui/nl/floater_live_lsleditor.xml | 12 - .../skins/default/xui/nl/floater_lsl_guide.xml | 7 - indra/newview/skins/default/xui/nl/floater_map.xml | 51 - .../skins/default/xui/nl/floater_media_browser.xml | 19 - .../skins/default/xui/nl/floater_mem_leaking.xml | 18 - .../skins/default/xui/nl/floater_moveview.xml | 13 - .../skins/default/xui/nl/floater_mute_object.xml | 14 - .../skins/default/xui/nl/floater_openobject.xml | 8 - indra/newview/skins/default/xui/nl/floater_pay.xml | 21 - .../skins/default/xui/nl/floater_pay_object.xml | 30 - .../skins/default/xui/nl/floater_perm_prefs.xml | 16 - .../skins/default/xui/nl/floater_post_process.xml | 53 - .../skins/default/xui/nl/floater_postcard.xml | 36 - .../skins/default/xui/nl/floater_preferences.xml | 8 - .../default/xui/nl/floater_preview_animation.xml | 8 - .../default/xui/nl/floater_preview_gesture.xml | 58 - .../default/xui/nl/floater_preview_notecard.xml | 16 - .../skins/default/xui/nl/floater_preview_sound.xml | 8 - .../default/xui/nl/floater_preview_texture.xml | 9 - .../skins/default/xui/nl/floater_region_info.xml | 2 - .../skins/default/xui/nl/floater_report_abuse.xml | 103 - .../skins/default/xui/nl/floater_script_debug.xml | 6 - .../default/xui/nl/floater_script_preview.xml | 6 - .../skins/default/xui/nl/floater_script_queue.xml | 4 - .../skins/default/xui/nl/floater_script_search.xml | 15 - .../skins/default/xui/nl/floater_select_key.xml | 7 - .../skins/default/xui/nl/floater_sell_land.xml | 65 - .../default/xui/nl/floater_settings_debug.xml | 13 - .../skins/default/xui/nl/floater_snapshot.xml | 79 - .../skins/default/xui/nl/floater_sound_preview.xml | 11 - .../newview/skins/default/xui/nl/floater_stats.xml | 71 - .../skins/default/xui/nl/floater_telehub.xml | 33 - .../skins/default/xui/nl/floater_texture_ctrl.xml | 23 - .../newview/skins/default/xui/nl/floater_tools.xml | 567 ---- .../skins/default/xui/nl/floater_top_objects.xml | 55 - indra/newview/skins/default/xui/nl/floater_tos.xml | 16 - .../skins/default/xui/nl/floater_url_entry.xml | 12 - .../skins/default/xui/nl/floater_world_map.xml | 54 - .../skins/default/xui/nl/language_settings.xml | 57 - .../skins/default/xui/nl/menu_inventory.xml | 82 - .../skins/default/xui/nl/menu_inventory_add.xml | 32 - indra/newview/skins/default/xui/nl/menu_login.xml | 13 - .../newview/skins/default/xui/nl/menu_mini_map.xml | 8 - indra/newview/skins/default/xui/nl/menu_picks.xml | 8 - .../default/xui/nl/menu_places_gear_landmark.xml | 18 - indra/newview/skins/default/xui/nl/menu_slurl.xml | 6 - indra/newview/skins/default/xui/nl/menu_viewer.xml | 207 -- indra/newview/skins/default/xui/nl/mime_types.xml | 230 -- .../newview/skins/default/xui/nl/notifications.xml | 3044 ------------------ .../default/xui/nl/panel_block_list_sidetray.xml | 10 - .../skins/default/xui/nl/panel_edit_profile.xml | 45 - .../skins/default/xui/nl/panel_group_general.xml | 72 - .../skins/default/xui/nl/panel_group_invite.xml | 24 - .../default/xui/nl/panel_group_land_money.xml | 84 - .../skins/default/xui/nl/panel_group_notices.xml | 62 - .../skins/default/xui/nl/panel_group_roles.xml | 101 - indra/newview/skins/default/xui/nl/panel_login.xml | 41 - .../skins/default/xui/nl/panel_main_inventory.xml | 64 - .../default/xui/nl/panel_preferences_advanced.xml | 48 - .../default/xui/nl/panel_preferences_alerts.xml | 14 - .../default/xui/nl/panel_preferences_chat.xml | 42 - .../default/xui/nl/panel_preferences_general.xml | 90 - .../default/xui/nl/panel_preferences_graphics1.xml | 145 - .../default/xui/nl/panel_preferences_privacy.xml | 32 - .../default/xui/nl/panel_preferences_setup.xml | 31 - .../default/xui/nl/panel_preferences_sound.xml | 39 - .../skins/default/xui/nl/panel_region_covenant.xml | 84 - .../skins/default/xui/nl/panel_region_debug.xml | 40 - .../skins/default/xui/nl/panel_region_estate.xml | 70 - .../skins/default/xui/nl/panel_region_general.xml | 53 - .../skins/default/xui/nl/panel_region_terrain.xml | 27 - .../skins/default/xui/nl/panel_region_texture.xml | 57 - .../skins/default/xui/nl/panel_scrolling_param.xml | 10 - .../skins/default/xui/nl/panel_status_bar.xml | 38 - .../skins/default/xui/nl/panel_world_map.xml | 57 - .../newview/skins/default/xui/nl/role_actions.xml | 76 - indra/newview/skins/default/xui/nl/strings.xml | 3247 -------------------- .../skins/default/xui/nl/teleport_strings.xml | 75 - .../default/xui/pl/panel_preferences_chat.xml | 2 +- .../default/xui/pl/panel_preferences_general.xml | 1 - .../default/xui/pt/panel_preferences_chat.xml | 2 +- .../default/xui/pt/panel_preferences_general.xml | 1 - .../default/xui/ru/floater_buy_currency_html.xml | 2 + .../default/xui/tr/floater_buy_currency_html.xml | 2 + .../default/xui/zh/panel_preferences_chat.xml | 2 +- .../default/xui/zh/panel_preferences_general.xml | 1 - .../xui/zh_CN/floater_buy_currency_html.xml | 2 + .../skins/minimal/xui/ru/menu_script_chiclet.xml | 4 + .../skins/minimal/xui/tr/menu_script_chiclet.xml | 4 + .../skins/minimal/xui/zh/menu_script_chiclet.xml | 4 + .../minimal/xui/zh_CN/menu_script_chiclet.xml | 4 + 135 files changed, 47 insertions(+), 11844 deletions(-) delete mode 100644 indra/newview/skins/default/xui/nl/floater_about.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_about_land.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_animation_preview.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_auction.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_avatar_picker.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_avatar_textures.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_beacons.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_build_options.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_bulk_perms.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_bumps.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_buy_contents.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_buy_currency.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_buy_land.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_buy_object.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_camera.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_choose_group.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_color_picker.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_critical.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_event.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_font_test.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_gesture.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_hardware_settings.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_hud.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_image_preview.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_inspect.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_inventory.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_inventory_item_properties.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_inventory_view_finder.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_joystick.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_lagmeter.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_land_holdings.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_live_lsleditor.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_lsl_guide.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_map.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_media_browser.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_mem_leaking.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_moveview.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_mute_object.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_openobject.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_pay.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_pay_object.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_perm_prefs.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_post_process.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_postcard.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_preferences.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_preview_animation.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_preview_gesture.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_preview_notecard.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_preview_sound.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_preview_texture.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_region_info.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_report_abuse.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_script_debug.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_script_preview.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_script_queue.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_script_search.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_select_key.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_sell_land.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_settings_debug.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_snapshot.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_sound_preview.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_stats.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_telehub.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_texture_ctrl.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_tools.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_top_objects.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_tos.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_url_entry.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_world_map.xml delete mode 100644 indra/newview/skins/default/xui/nl/language_settings.xml delete mode 100644 indra/newview/skins/default/xui/nl/menu_inventory.xml delete mode 100644 indra/newview/skins/default/xui/nl/menu_inventory_add.xml delete mode 100644 indra/newview/skins/default/xui/nl/menu_login.xml delete mode 100644 indra/newview/skins/default/xui/nl/menu_mini_map.xml delete mode 100644 indra/newview/skins/default/xui/nl/menu_picks.xml delete mode 100644 indra/newview/skins/default/xui/nl/menu_places_gear_landmark.xml delete mode 100644 indra/newview/skins/default/xui/nl/menu_slurl.xml delete mode 100644 indra/newview/skins/default/xui/nl/menu_viewer.xml delete mode 100644 indra/newview/skins/default/xui/nl/mime_types.xml delete mode 100644 indra/newview/skins/default/xui/nl/notifications.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_block_list_sidetray.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_edit_profile.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_group_general.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_group_invite.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_group_land_money.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_group_notices.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_group_roles.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_login.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_main_inventory.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_preferences_advanced.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_preferences_alerts.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_preferences_chat.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_preferences_general.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_preferences_graphics1.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_preferences_privacy.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_preferences_setup.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_preferences_sound.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_region_covenant.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_region_debug.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_region_estate.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_region_general.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_region_terrain.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_region_texture.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_scrolling_param.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_status_bar.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_world_map.xml delete mode 100644 indra/newview/skins/default/xui/nl/role_actions.xml delete mode 100644 indra/newview/skins/default/xui/nl/strings.xml delete mode 100644 indra/newview/skins/default/xui/nl/teleport_strings.xml create mode 100644 indra/newview/skins/default/xui/ru/floater_buy_currency_html.xml create mode 100644 indra/newview/skins/default/xui/tr/floater_buy_currency_html.xml create mode 100644 indra/newview/skins/default/xui/zh_CN/floater_buy_currency_html.xml create mode 100644 indra/newview/skins/minimal/xui/ru/menu_script_chiclet.xml create mode 100644 indra/newview/skins/minimal/xui/tr/menu_script_chiclet.xml create mode 100644 indra/newview/skins/minimal/xui/zh/menu_script_chiclet.xml create mode 100644 indra/newview/skins/minimal/xui/zh_CN/menu_script_chiclet.xml diff --git a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml index 19c82509cd..f0f6242fff 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml @@ -51,7 +51,7 @@ - + diff --git a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml index ca8af27f58..104f89b80c 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml @@ -51,7 +51,7 @@ - + diff --git a/indra/newview/skins/default/xui/de/panel_preferences_general.xml b/indra/newview/skins/default/xui/de/panel_preferences_general.xml index 79b2a544f9..ed22e05a7c 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_general.xml @@ -11,7 +11,6 @@ - diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml index ea09286592..52be805260 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml @@ -307,7 +307,7 @@ name="Ukrainian" value="uk" /> - + + + - + diff --git a/indra/newview/skins/default/xui/es/panel_preferences_general.xml b/indra/newview/skins/default/xui/es/panel_preferences_general.xml index e725e4a05a..c762e6b7fe 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_general.xml @@ -11,7 +11,6 @@ - diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml index 1644eefbee..646f53704c 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml @@ -51,7 +51,7 @@ - + diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml index 2786798173..5ccf07f7b4 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml @@ -11,7 +11,6 @@ - diff --git a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml index 2834d520d1..72e687b6d1 100644 --- a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml @@ -51,7 +51,7 @@ - + diff --git a/indra/newview/skins/default/xui/it/panel_preferences_general.xml b/indra/newview/skins/default/xui/it/panel_preferences_general.xml index c576b5f9d8..ee52ee7cb1 100644 --- a/indra/newview/skins/default/xui/it/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_general.xml @@ -11,7 +11,6 @@ - diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml index 5038140ce5..20e17de5f1 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml @@ -51,7 +51,7 @@ - + diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml index e4091972d6..4356f3d47f 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml @@ -11,7 +11,6 @@ - diff --git a/indra/newview/skins/default/xui/nl/floater_about.xml b/indra/newview/skins/default/xui/nl/floater_about.xml deleted file mode 100644 index 4e22d865fe..0000000000 --- a/indra/newview/skins/default/xui/nl/floater_about.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL]) -[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]] - - - Gemaakt met [COMPILER] versie [COMPILER_VERSION] - - - U bent op [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] in [REGION] gelegen op <nolink>[HOSTNAME]</nolink> ([HOSTIP]) -[SERVER_VERSION] -[[SERVER_RELEASE_NOTES_URL] [ReleaseNotes]] - - - CPU: [CPU] -Geheugen: [MEMORY_MB] MB -OS Versie: [OS_VERSION] -Grafische Kaard Vendor: [GRAPHICS_CARD_VENDOR] -Grafische Kaard: [GRAPHICS_CARD] - - - Windows Grafische Driver Versie: [GRAPHICS_DRIVER_VERSION] - - - OpenGL Versie: [OPENGL_VERSION] - -libcurl Versie: [LIBCURL_VERSION] -J2C Decoder Versie: [J2C_VERSION] -Audio Driver Versie: [AUDIO_DRIVER_VERSION] -Qt Webkit Versie: [QT_WEBKIT_VERSION] -Vivox Versie: [VIVOX_VERSION] - - - (none) - - - Pakketten Verloren: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%) - - - - + + diff --git a/indra/newview/skins/default/xui/en/floater_critical.xml b/indra/newview/skins/default/xui/en/floater_critical.xml index 05c958e051..13b15bf724 100644 --- a/indra/newview/skins/default/xui/en/floater_critical.xml +++ b/indra/newview/skins/default/xui/en/floater_critical.xml @@ -6,7 +6,7 @@ height="500" layout="topleft" name="modal container" - open_centered="true" + open_positioning="centered" width="600"> + diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml index f017a7ace6..3f5768bc0b 100644 --- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml @@ -1,15 +1,16 @@ - NEARBY VOICE + Nearby voice - Group Call with [GROUP] + Group call with [GROUP] - Conference Call + Conference call diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml index 0eda9ae62a..57d1c92acb 100644 --- a/indra/newview/skins/default/xui/en/floater_web_content.xml +++ b/indra/newview/skins/default/xui/en/floater_web_content.xml @@ -9,7 +9,6 @@ name="floater_web_content" help_topic="floater_web_content" save_rect="true" - auto_tile="true" title="" initial_mime_type="text/html" width="780"> diff --git a/indra/newview/skins/default/xui/en/floater_web_profile.xml b/indra/newview/skins/default/xui/en/floater_web_profile.xml new file mode 100644 index 0000000000..d0225f78a9 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_web_profile.xml @@ -0,0 +1,6 @@ + + \ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml index 019e7cd032..4314c8a9e2 100644 --- a/indra/newview/skins/default/xui/en/floater_world_map.xml +++ b/indra/newview/skins/default/xui/en/floater_world_map.xml @@ -2,7 +2,7 @@ + top="0"> + + + - - + - - - - - - - - - - - - - - - - + + - + left="0" + follows="all" + height="500" + mouse_opaque="false" + name="login_panel_holder" + width="1024"/> - - - - + width="1024"/> + - - - + - - - - - - - - - - - - - - - diff --git a/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml index 29eeb93ac1..b452f96e7a 100644 --- a/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml +++ b/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml @@ -42,6 +42,6 @@ - + diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml index 65bd2793b6..614dd693c5 100644 --- a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml +++ b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml @@ -52,6 +52,6 @@ - + diff --git a/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml index 0634e3bd3b..485a5a658c 100644 --- a/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml +++ b/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml @@ -34,6 +34,6 @@ - + diff --git a/indra/newview/skins/default/xui/en/menu_toolbars.xml b/indra/newview/skins/default/xui/en/menu_toolbars.xml new file mode 100644 index 0000000000..59912b5503 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_toolbars.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 16f48f3a4e..63e50b0b9f 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -8,169 +8,178 @@ label="Me" name="Me" tear_off="true"> - - - - - + + - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - + label="Sit Down" + layout="topleft" + shortcut="alt|shift|S" + name="Sit Down Here"> + + - - - - - - - - - - + label="Fly" + name="Fly" + shortcut="Home"> + + + - - + label="Always Run" + name="Always Run" + shortcut="control|R"> + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + label="Stop Animating Me" + name="Stop Animating My Avatar"> + + + + + label="Away" + name="Set Away"> + + + + + + + + + + + + + + + + + + + + + + + + function="Floater.Show" + parameter="preferences" /> + + + + + + @@ -219,10 +228,10 @@ use_mac_ctrl="true"> + parameter="chat_bar" /> + parameter="chat_bar" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml new file mode 100644 index 0000000000..355a76e05f --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml @@ -0,0 +1,176 @@ + + + + + + + + + + + + + + + diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index 1c3e08d59b..3835cd17b6 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -120,33 +120,6 @@ label="Remember password" follows="left|bottom" font="SansSerifSmall" height="15" - left_pad="10" - name="mode_selection_text" - top="20" - width="130"> - Mode: - - - - - - - - - - - + diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml index 51ffec4727..7a8e872dc9 100644 --- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml @@ -5,21 +5,21 @@ bg_opaque_color="MouseGray" follows="left|top|right" focus_root="true" - height="60" + height="34" layout="topleft" name="navigation_bar" chrome="true" - width="600"> + width="800"> + + + + width="480"> + width="355"> - - - - - - - - - - - - - - - - - + + + + + + + - - - - + auto_resize="true" + user_resize="true" + min_width="315" + name="favorites_layout_panel" + width="315"> + width="311"> - + + + More ▼ + + + + diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat.xml new file mode 100644 index 0000000000..f766236b2e --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_nearby_chat.xml @@ -0,0 +1,35 @@ + + + + + diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml index 7daa52b2d9..24046d5cca 100644 --- a/indra/newview/skins/default/xui/en/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml @@ -117,7 +117,7 @@ + top_pad="0" + width="312"> - - Keyboard: + Keyboard: - Mouse: + Mouse: - Single click on land: + Single click on land: - Double click on land: + Double click on land: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml index 5894abd03b..422bbada7f 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -35,8 +35,8 @@ + diff --git a/indra/newview/skins/default/xui/en/widgets/floater.xml b/indra/newview/skins/default/xui/en/widgets/floater.xml index 2e5ebafe46..adbb183317 100644 --- a/indra/newview/skins/default/xui/en/widgets/floater.xml +++ b/indra/newview/skins/default/xui/en/widgets/floater.xml @@ -1,7 +1,9 @@ - + + + + + diff --git a/indra/newview/skins/minimal/xui/da/floater_camera.xml b/indra/newview/skins/minimal/xui/da/floater_camera.xml deleted file mode 100644 index 5b7ef6db54..0000000000 --- a/indra/newview/skins/minimal/xui/da/floater_camera.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - Roter kamera omkring fokus - - - Zoom kamera mod fokus - - - Flyt kamera op og ned, til venstre og højre - - - Kamera valg - - - Kredsløb zoom panorering - - - Forvalg - - - Se objekt - - - - - - Se forfra - - - - - Se fra siden - - - - - Se bagfra - - - - - - - Se fra objekt - - - - - Førsteperson - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/indra/newview/skins/minimal/xui/en/floater_help_browser.xml b/indra/newview/skins/minimal/xui/en/floater_help_browser.xml deleted file mode 100644 index 477f210352..0000000000 --- a/indra/newview/skins/minimal/xui/en/floater_help_browser.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - Loading... - - - - - - - - - diff --git a/indra/newview/skins/minimal/xui/en/floater_media_browser.xml b/indra/newview/skins/minimal/xui/en/floater_media_browser.xml deleted file mode 100644 index 4862146c94..0000000000 --- a/indra/newview/skins/minimal/xui/en/floater_media_browser.xml +++ /dev/null @@ -1,242 +0,0 @@ - - - - http://www.secondlife.com - - - http://support.secondlife.com - - - - - - - - - - - - - - - - - - - - - - diff --git a/indra/newview/skins/minimal/xui/en/floater_nearby_chat.xml b/indra/newview/skins/minimal/xui/en/floater_nearby_chat.xml deleted file mode 100644 index 74ac885202..0000000000 --- a/indra/newview/skins/minimal/xui/en/floater_nearby_chat.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - diff --git a/indra/newview/skins/minimal/xui/en/floater_side_bar_tab.xml b/indra/newview/skins/minimal/xui/en/floater_side_bar_tab.xml deleted file mode 100644 index 83b1260620..0000000000 --- a/indra/newview/skins/minimal/xui/en/floater_side_bar_tab.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/indra/newview/skins/minimal/xui/en/floater_web_content.xml b/indra/newview/skins/minimal/xui/en/floater_web_content.xml deleted file mode 100644 index 1d9a967d5a..0000000000 --- a/indra/newview/skins/minimal/xui/en/floater_web_content.xml +++ /dev/null @@ -1,196 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/indra/newview/skins/minimal/xui/en/inspect_avatar.xml b/indra/newview/skins/minimal/xui/en/inspect_avatar.xml deleted file mode 100644 index 853d5f8735..0000000000 --- a/indra/newview/skins/minimal/xui/en/inspect_avatar.xml +++ /dev/null @@ -1,206 +0,0 @@ - - - - - -[AGE] - - -[SL_PROFILE] - - - - - - This is my second life description and I really think it is great. But for some reason my description is super extra long because I like to talk a whole lot - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/indra/newview/skins/minimal/xui/en/panel_group_control_panel.xml b/indra/newview/skins/minimal/xui/en/panel_group_control_panel.xml deleted file mode 100644 index abddc59296..0000000000 --- a/indra/newview/skins/minimal/xui/en/panel_group_control_panel.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - - - - - - -