livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Automated merge up from viewer-development into mesh-development

master
Loren Shih 2011-02-08 12:46:43 -05:00
parent 8b15ca8d6b 09b009fc23
commit bfbd8e22cb
20 changed files with 367 additions and 291 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llfilepicker.cpp
View File

@ -420,9 +420,9 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const std::string& filename)
{
wcsncpy( mFilesW,L"untitled.jpeg", FILENAME_BUFFER_SIZE); /*Flawfinder: ignore*/
}
mOFN.lpstrDefExt = L"jpeg";
mOFN.lpstrDefExt = L"jpg";
mOFN.lpstrFilter =
L"JPEG Images (*.jpeg)\0*.jpeg\0" \
L"JPEG Images (*.jpg *.jpeg)\0*.jpg;*.jpeg\0" \
L"\0";
break;
case FFSAVE_AVI:

36
indra/newview/llfloaterregiondebugconsole.cpp
View File

@ -3,31 +3,25 @@
* @author Brad Kittenbrink <brad@lindenlab.com>
* @brief Quick and dirty console for region debug settings
*
* $LicenseInfo:firstyear=2010&license=viewergpl$
*
* Copyright (c) 2010-2010, Linden Research, Inc.
*
* $LicenseInfo:firstyear=2010&license=viewerlgpl$
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
* to you under the terms of the GNU General Public License, version 2.0
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
* Copyright (C) 2010, Linden Research, Inc.
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
* online at
* http://secondlifegrid.net/programs/open_source/licensing/flossexception
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
*
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
* and agree to abide by those obligations.
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
* COMPLETENESS OR PERFORMANCE.
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/

36
indra/newview/llmaniprotate.cpp
View File

@ -901,32 +901,32 @@ void LLManipRotate::renderSnapGuides()
{
if (i == 0)
{
renderTickText(text_point, mObjectSelection->isAttachment() ? LLTrans::getString("Forward") : LLTrans::getString("East"), LLColor4::white);
renderTickText(text_point, mObjectSelection->isAttachment() ? LLTrans::getString("Direction_Forward") : LLTrans::getString("Direction_East"), LLColor4::white);
}
else if (i == 16)
{
if (constraint_axis.mV[VZ] > 0.f)
{
renderTickText(text_point, mObjectSelection->isAttachment() ? LLTrans::getString("Left") : LLTrans::getString("North"), LLColor4::white);
renderTickText(text_point, mObjectSelection->isAttachment() ? LLTrans::getString("Direction_Left") : LLTrans::getString("Direction_North"), LLColor4::white);
}
else
{
renderTickText(text_point, mObjectSelection->isAttachment() ? LLTrans::getString("Right") : LLTrans::getString("South"), LLColor4::white);
renderTickText(text_point, mObjectSelection->isAttachment() ? LLTrans::getString("Direction_Right") : LLTrans::getString("Direction_South"), LLColor4::white);
}
}
else if (i == 32)
{
renderTickText(text_point, mObjectSelection->isAttachment() ? LLTrans::getString("Back") : LLTrans::getString("West"), LLColor4::white);
renderTickText(text_point, mObjectSelection->isAttachment() ? LLTrans::getString("Direction_Back") : LLTrans::getString("Direction_West"), LLColor4::white);
}
else
{
if (constraint_axis.mV[VZ] > 0.f)
{
renderTickText(text_point, mObjectSelection->isAttachment() ? LLTrans::getString("Right") : LLTrans::getString("South"), LLColor4::white);
renderTickText(text_point, mObjectSelection->isAttachment() ? LLTrans::getString("Direction_Right") : LLTrans::getString("Direction_South"), LLColor4::white);
}
else
{
renderTickText(text_point, mObjectSelection->isAttachment() ? LLTrans::getString("Left") : LLTrans::getString("North"), LLColor4::white);
renderTickText(text_point, mObjectSelection->isAttachment() ? LLTrans::getString("Direction_Left") : LLTrans::getString("Direction_North"), LLColor4::white);
}
}
}
@ -934,32 +934,32 @@ void LLManipRotate::renderSnapGuides()
{
if (i == 0)
{
renderTickText(text_point, mObjectSelection->isAttachment() ? LLTrans::getString("Left") : LLTrans::getString("North"), LLColor4::white);
renderTickText(text_point, mObjectSelection->isAttachment() ? LLTrans::getString("Direction_Left") : LLTrans::getString("Direction_North"), LLColor4::white);
}
else if (i == 16)
{
if (constraint_axis.mV[VX] > 0.f)
{
renderTickText(text_point, LLTrans::getString("Up"), LLColor4::white);
renderTickText(text_point, LLTrans::getString("Direction_Up"), LLColor4::white);
}
else
{
renderTickText(text_point, LLTrans::getString("Down"), LLColor4::white);
renderTickText(text_point, LLTrans::getString("Direction_Down"), LLColor4::white);
}
}
else if (i == 32)
{
renderTickText(text_point, mObjectSelection->isAttachment() ? LLTrans::getString("Right") : LLTrans::getString("South"), LLColor4::white);
renderTickText(text_point, mObjectSelection->isAttachment() ? LLTrans::getString("Direction_Right") : LLTrans::getString("Direction_South"), LLColor4::white);
}
else
{
if (constraint_axis.mV[VX] > 0.f)
{
renderTickText(text_point, LLTrans::getString("Down"), LLColor4::white);
renderTickText(text_point, LLTrans::getString("Direction_Down"), LLColor4::white);
}
else
{
renderTickText(text_point, LLTrans::getString("Up"), LLColor4::white);
renderTickText(text_point, LLTrans::getString("Direction_Up"), LLColor4::white);
}
}
}
@ -967,32 +967,32 @@ void LLManipRotate::renderSnapGuides()
{
if (i == 0)
{
renderTickText(text_point, LLTrans::getString("Up"), LLColor4::white);
renderTickText(text_point, LLTrans::getString("Direction_Up"), LLColor4::white);
}
else if (i == 16)
{
if (constraint_axis.mV[VY] > 0.f)
{
renderTickText(text_point, mObjectSelection->isAttachment() ? LLTrans::getString("Forward") : LLTrans::getString("East"), LLColor4::white);
renderTickText(text_point, mObjectSelection->isAttachment() ? LLTrans::getString("Direction_Forward") : LLTrans::getString("Direction_East"), LLColor4::white);
}
else
{
renderTickText(text_point, mObjectSelection->isAttachment() ? LLTrans::getString("Back") : LLTrans::getString("West"), LLColor4::white);
renderTickText(text_point, mObjectSelection->isAttachment() ? LLTrans::getString("Direction_Back") : LLTrans::getString("Direction_West"), LLColor4::white);
}
}
else if (i == 32)
{
renderTickText(text_point, LLTrans::getString("Down"), LLColor4::white);
renderTickText(text_point, LLTrans::getString("Direction_Down"), LLColor4::white);
}
else
{
if (constraint_axis.mV[VY] > 0.f)
{
renderTickText(text_point, mObjectSelection->isAttachment() ? LLTrans::getString("Back") : LLTrans::getString("West"), LLColor4::white);
renderTickText(text_point, mObjectSelection->isAttachment() ? LLTrans::getString("Direction_Back") : LLTrans::getString("Direction_West"), LLColor4::white);
}
else
{
renderTickText(text_point, mObjectSelection->isAttachment() ? LLTrans::getString("Forward") : LLTrans::getString("East"), LLColor4::white);
renderTickText(text_point, mObjectSelection->isAttachment() ? LLTrans::getString("Direction_Forward") : LLTrans::getString("Direction_East"), LLColor4::white);
}
}
}

36
indra/newview/llsimplestat.h
View File

@ -2,31 +2,25 @@
* @file llsimplestat.h
* @brief Runtime statistics accumulation.
*
* $LicenseInfo:firstyear=2010&license=viewergpl$
*
* Copyright (c) 2010, Linden Research, Inc.
*
* $LicenseInfo:firstyear=2010&license=viewerlgpl$
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
* to you under the terms of the GNU General Public License, version 2.0
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
* Copyright (C) 2010, Linden Research, Inc.
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
* online at
* http://secondlifegrid.net/programs/open_source/licensing/flossexception
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
*
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
* and agree to abide by those obligations.
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
* COMPLETENESS OR PERFORMANCE.
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/

42
indra/newview/lltranslate.cpp
View File

@ -2,27 +2,27 @@
* @file lltranslate.cpp
* @brief Functions for translating text via Google Translate.
*
* $LicenseInfo:firstyear=2009&license=viewerlgpl$
* Second Life Viewer Source Code
* Copyright (C) 2010, Linden Research, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/
* $LicenseInfo:firstyear=2009&license=viewerlgpl$
* Second Life Viewer Source Code
* Copyright (C) 2010, Linden Research, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/
#include "llviewerprecompiledheaders.h"

42
indra/newview/lltranslate.h
View File

@ -2,27 +2,27 @@
* @file lltranslate.h
* @brief Human language translation class and JSON response receiver.
*
* $LicenseInfo:firstyear=2009&license=viewerlgpl$
* Second Life Viewer Source Code
* Copyright (C) 2010, Linden Research, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/
* $LicenseInfo:firstyear=2009&license=viewerlgpl$
* Second Life Viewer Source Code
* Copyright (C) 2010, Linden Research, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/
#ifndef LL_LLTRANSLATE_H
#define LL_LLTRANSLATE_H

36
indra/newview/llviewerassetstats.cpp
View File

@ -2,31 +2,25 @@
* @file llviewerassetstats.cpp
* @brief
*
* $LicenseInfo:firstyear=2010&license=viewergpl$
*
* Copyright (c) 2010, Linden Research, Inc.
*
* $LicenseInfo:firstyear=2010&license=viewerlgpl$
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
* to you under the terms of the GNU General Public License, version 2.0
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
* Copyright (C) 2010, Linden Research, Inc.
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
* online at
* http://secondlifegrid.net/programs/open_source/licensing/flossexception
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
*
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
* and agree to abide by those obligations.
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
* COMPLETENESS OR PERFORMANCE.
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/

36
indra/newview/llviewerassetstats.h
View File

@ -2,31 +2,25 @@
* @file llviewerassetstats.h
* @brief Client-side collection of asset request statistics
*
* $LicenseInfo:firstyear=2010&license=viewergpl$
*
* Copyright (c) 2010, Linden Research, Inc.
*
* $LicenseInfo:firstyear=2010&license=viewerlgpl$
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
* to you under the terms of the GNU General Public License, version 2.0
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
* Copyright (C) 2010, Linden Research, Inc.
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
* online at
* http://secondlifegrid.net/programs/open_source/licensing/flossexception
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
*
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
* and agree to abide by those obligations.
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
* COMPLETENESS OR PERFORMANCE.
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/

20
indra/newview/skins/default/xui/da/strings.xml
View File

@ -1843,34 +1843,34 @@ Forventet .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
<string name="PDT">
PDT
</string>
<string name="Forward">
<string name="Direction_Forward">
Fremad
</string>
<string name="Left">
<string name="Direction_Left">
Venstre
</string>
<string name="Right">
<string name="Direction_Right">
Højre
</string>
<string name="Back">
<string name="Direction_Back">
Bagud
</string>
<string name="North">
<string name="Direction_North">
Nord
</string>
<string name="South">
<string name="Direction_South">
Syd
</string>
<string name="West">
<string name="Direction_West">
Vest
</string>
<string name="East">
<string name="Direction_East">
Øst
</string>
<string name="Up">
<string name="Direction_Up">
Op
</string>
<string name="Down">
<string name="Direction_Down">
Ned
</string>
<string name="Any Category">

20
indra/newview/skins/default/xui/de/strings.xml
View File

@ -1888,34 +1888,34 @@ Gültige Formate: .wav, .tga, .bmp, .jpg, .jpeg oder .bvh
<string name="PDT">
PDT
</string>
<string name="Forward">
<string name="Direction_Forward">
Vorwärts
</string>
<string name="Left">
<string name="Direction_Left">
Links
</string>
<string name="Right">
<string name="Direction_Right">
Rechts
</string>
<string name="Back">
<string name="Direction_Back">
Hinten
</string>
<string name="North">
<string name="Direction_North">
Norden
</string>
<string name="South">
<string name="Direction_South">
Süden
</string>
<string name="West">
<string name="Direction_West">
Westen
</string>
<string name="East">
<string name="Direction_East">
Osten
</string>
<string name="Up">
<string name="Direction_Up">
Nach oben
</string>
<string name="Down">
<string name="Direction_Down">
Nach unten
</string>
<string name="Any Category">

138
indra/newview/skins/default/xui/en/strings.xml
View File

@ -2323,9 +2323,6 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
<string name="accel-win-alt">Alt+</string>
<string name="accel-win-shift">Shift+</string>
<string name="Esc">Esc</string>
<string name="Home">Home</string>
<!-- Previews -->
<string name="FileSaved">File Saved</string>
<string name="Receiving">Receiving</string>
@ -2337,16 +2334,16 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
<string name="PDT">PDT</string>
<!-- Directions, HUD -->
<string name="Forward">Forward</string>
<string name="Left">Left</string>
<string name="Right">Right</string>
<string name="Back">Back</string>
<string name="North">North</string>
<string name="South">South</string>
<string name="West">West</string>
<string name="East">East</string>
<string name="Up">Up</string>
<string name="Down">Down</string>
<string name="Direction_Forward">Forward</string>
<string name="Direction_Left">Left</string>
<string name="Direction_Right">Right</string>
<string name="Direction_Back">Back</string>
<string name="Direction_North">North</string>
<string name="Direction_South">South</string>
<string name="Direction_West">West</string>
<string name="Direction_East">East</string>
<string name="Direction_Up">Up</string>
<string name="Direction_Down">Down</string>
<!-- Search Category Strings -->
<string name="Any Category">Any Category</string>
@ -3315,4 +3312,119 @@ Abuse Report</string>
<string name="EmptyOutfitText">There are no items in this outfit</string>
<!-- Key names begin -->
<string name="Esc">Esc</string>
<string name="Space">Space</string>
<string name="Enter">Enter</string>
<string name="Tab">Tab</string>
<string name="Ins">Ins</string>
<string name="Del">Del</string>
<string name="Backsp">Backsp</string>
<string name="Shift">Shift</string>
<string name="Ctrl">Ctrl</string>
<string name="Alt">Alt</string>
<string name="CapsLock">CapsLock</string>
<string name="Left">Left</string>
<string name="Right">Right</string>
<string name="Up">Up</string>
<string name="Down">Down</string>
<string name="Home">Home</string>
<string name="End">End</string>
<string name="PgUp">PgUp</string>
<string name="PgDn">PgDn</string>
<string name="F1">F1</string>
<string name="F2">F2</string>
<string name="F3">F3</string>
<string name="F4">F4</string>
<string name="F5">F5</string>
<string name="F6">F6</string>
<string name="F7">F7</string>
<string name="F8">F8</string>
<string name="F9">F9</string>
<string name="F10">F10</string>
<string name="F11">F11</string>
<string name="F12">F12</string>
<string name="Add">Add</string>
<string name="Subtract">Subtract</string>
<string name="Multiply">Multiply</string>
<string name="Divide">Divide</string>
<string name="PAD_DIVIDE">PAD_DIVIDE</string>
<string name="PAD_LEFT">PAD_LEFT</string>
<string name="PAD_RIGHT">PAD_RIGHT</string>
<string name="PAD_DOWN">PAD_DOWN</string>
<string name="PAD_UP">PAD_UP</string>
<string name="PAD_HOME">PAD_HOME</string>
<string name="PAD_END">PAD_END</string>
<string name="PAD_PGUP">PAD_PGUP</string>
<string name="PAD_PGDN">PAD_PGDN</string>
<string name="PAD_CENTER">PAD_CENTER</string>
<string name="PAD_INS">PAD_INS</string>
<string name="PAD_DEL">PAD_DEL</string>
<string name="PAD_Enter">PAD_Enter</string>
<string name="PAD_BUTTON0">PAD_BUTTON0</string>
<string name="PAD_BUTTON1">PAD_BUTTON1</string>
<string name="PAD_BUTTON2">PAD_BUTTON2</string>
<string name="PAD_BUTTON3">PAD_BUTTON3</string>
<string name="PAD_BUTTON4">PAD_BUTTON4</string>
<string name="PAD_BUTTON5">PAD_BUTTON5</string>
<string name="PAD_BUTTON6">PAD_BUTTON6</string>
<string name="PAD_BUTTON7">PAD_BUTTON7</string>
<string name="PAD_BUTTON8">PAD_BUTTON8</string>
<string name="PAD_BUTTON9">PAD_BUTTON9</string>
<string name="PAD_BUTTON10">PAD_BUTTON10</string>
<string name="PAD_BUTTON11">PAD_BUTTON11</string>
<string name="PAD_BUTTON12">PAD_BUTTON12</string>
<string name="PAD_BUTTON13">PAD_BUTTON13</string>
<string name="PAD_BUTTON14">PAD_BUTTON14</string>
<string name="PAD_BUTTON15">PAD_BUTTON15</string>
<string name="-">-</string>
<string name="=">=</string>
<string name="`">`</string>
<string name=";">;</string>
<string name="[">[</string>
<string name="]">]</string>
<string name="\">\</string>
<string name="0">0</string>
<string name="1">1</string>
<string name="2">2</string>
<string name="3">3</string>
<string name="4">4</string>
<string name="5">5</string>
<string name="6">6</string>
<string name="7">7</string>
<string name="8">8</string>
<string name="9">9</string>
<string name="A">A</string>
<string name="B">B</string>
<string name="C">C</string>
<string name="D">D</string>
<string name="E">E</string>
<string name="F">F</string>
<string name="G">G</string>
<string name="H">H</string>
<string name="I">I</string>
<string name="J">J</string>
<string name="K">K</string>
<string name="L">L</string>
<string name="M">M</string>
<string name="N">N</string>
<string name="O">O</string>
<string name="P">P</string>
<string name="Q">Q</string>
<string name="R">R</string>
<string name="S">S</string>
<string name="T">T</string>
<string name="U">U</string>
<string name="V">V</string>
<string name="W">W</string>
<string name="X">X</string>
<string name="Y">Y</string>
<string name="Z">Z</string>
<!-- Key names end -->
</strings>

20
indra/newview/skins/default/xui/es/strings.xml
View File

@ -1846,34 +1846,34 @@ Se esperaba .wav, .tga, .bmp, .jpg, .jpeg, o .bvh
<string name="PDT">
PDT
</string>
<string name="Forward">
<string name="Direction_Forward">
Adelante
</string>
<string name="Left">
<string name="Direction_Left">
Izquierda
</string>
<string name="Right">
<string name="Direction_Right">
Derecha
</string>
<string name="Back">
<string name="Direction_Back">
Atrás
</string>
<string name="North">
<string name="Direction_North">
Norte
</string>
<string name="South">
<string name="Direction_South">
Sur
</string>
<string name="West">
<string name="Direction_West">
Oeste
</string>
<string name="East">
<string name="Direction_East">
Este
</string>
<string name="Up">
<string name="Direction_Up">
Arriba
</string>
<string name="Down">
<string name="Direction_Down">
Abajo
</string>
<string name="Any Category">

20
indra/newview/skins/default/xui/fr/strings.xml
View File

@ -1888,34 +1888,34 @@
<string name="PDT">
PDT
</string>
<string name="Forward">
<string name="Direction_Forward">
Vers l&apos;avant
</string>
<string name="Left">
<string name="Direction_Left">
Gauche
</string>
<string name="Right">
<string name="Direction_Right">
Droite
</string>
<string name="Back">
<string name="Direction_Back">
Arrière
</string>
<string name="North">
<string name="Direction_North">
Nord
</string>
<string name="South">
<string name="Direction_South">
Sud
</string>
<string name="West">
<string name="Direction_West">
Ouest
</string>
<string name="East">
<string name="Direction_East">
Est
</string>
<string name="Up">
<string name="Direction_Up">
Haut
</string>
<string name="Down">
<string name="Direction_Down">
Bas
</string>
<string name="Any Category">

20
indra/newview/skins/default/xui/it/strings.xml
View File

@ -1846,34 +1846,34 @@ Tipi conosciuti .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
<string name="PDT">
Ora legale Pacifico
</string>
<string name="Forward">
<string name="Direction_Forward">
Avanti
</string>
<string name="Left">
<string name="Direction_Left">
Sinistra
</string>
<string name="Right">
<string name="Direction_Right">
Destra
</string>
<string name="Back">
<string name="Direction_Back">
Indietro
</string>
<string name="North">
<string name="Direction_North">
Nord
</string>
<string name="South">
<string name="Direction_South">
Sud
</string>
<string name="West">
<string name="Direction_West">
Ovest
</string>
<string name="East">
<string name="Direction_East">
Est
</string>
<string name="Up">
<string name="Direction_Up">
Su
</string>
<string name="Down">
<string name="Direction_Down">
Giù
</string>
<string name="Any Category">

20
indra/newview/skins/default/xui/ja/strings.xml
View File

@ -1882,34 +1882,34 @@
<string name="PDT">
太平洋夏時間
</string>
<string name="Forward">
<string name="Direction_Forward">
前
</string>
<string name="Left">
<string name="Direction_Left">
左
</string>
<string name="Right">
<string name="Direction_Right">
右
</string>
<string name="Back">
<string name="Direction_Back">
後ろ
</string>
<string name="North">
<string name="Direction_North">
北
</string>
<string name="South">
<string name="Direction_South">
南
</string>
<string name="West">
<string name="Direction_West">
西
</string>
<string name="East">
<string name="Direction_East">
東
</string>
<string name="Up">
<string name="Direction_Up">
上
</string>
<string name="Down">
<string name="Direction_Down">
下
</string>
<string name="Any Category">

20
indra/newview/skins/default/xui/nl/strings.xml
View File

@ -1441,34 +1441,34 @@ Verwacht .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
<string name="PDT">
PDT
</string>
<string name="Forward">
<string name="Direction_Forward">
Vooruit
</string>
<string name="Left">
<string name="Direction_Left">
Links
</string>
<string name="Right">
<string name="Direction_Right">
Rechts
</string>
<string name="Back">
<string name="Direction_Back">
Achteruit
</string>
<string name="North">
<string name="Direction_North">
Noord
</string>
<string name="South">
<string name="Direction_South">
Zuid
</string>
<string name="West">
<string name="Direction_West">
West
</string>
<string name="East">
<string name="Direction_East">
Oost
</string>
<string name="Up">
<string name="Direction_Up">
Omhoog
</string>
<string name="Down">
<string name="Direction_Down">
Omlaag
</string>
<string name="Any Category">

20
indra/newview/skins/default/xui/pl/strings.xml
View File

@ -1843,34 +1843,34 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
<string name="PDT">
PDT
</string>
<string name="Forward">
<string name="Direction_Forward">
Do przodu
</string>
<string name="Left">
<string name="Direction_Left">
W lewo
</string>
<string name="Right">
<string name="Direction_Right">
W prawo
</string>
<string name="Back">
<string name="Direction_Back">
Wróć
</string>
<string name="North">
<string name="Direction_North">
Północ
</string>
<string name="South">
<string name="Direction_South">
Południe
</string>
<string name="West">
<string name="Direction_West">
Zachód
</string>
<string name="East">
<string name="Direction_East">
Wschód
</string>
<string name="Up">
<string name="Direction_Up">
W górę
</string>
<string name="Down">
<string name="Direction_Down">
W dół
</string>
<string name="Any Category">

20
indra/newview/skins/default/xui/pt/strings.xml
View File

@ -1846,34 +1846,34 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
<string name="PDT">
PDT
</string>
<string name="Forward">
<string name="Direction_Forward">
Avante
</string>
<string name="Left">
<string name="Direction_Left">
Esquerda
</string>
<string name="Right">
<string name="Direction_Right">
Direita
</string>
<string name="Back">
<string name="Direction_Back">
Atrás
</string>
<string name="North">
<string name="Direction_North">
Norte
</string>
<string name="South">
<string name="Direction_South">
Sul
</string>
<string name="West">
<string name="Direction_West">
Oeste
</string>
<string name="East">
<string name="Direction_East">
Leste
</string>
<string name="Up">
<string name="Direction_Up">
Acima
</string>
<string name="Down">
<string name="Direction_Down">
Abaixo
</string>
<string name="Any Category">

36
indra/newview/tests/llsimplestat_test.cpp
View File

@ -3,31 +3,25 @@
* @date 2010-10-22
* @brief Test cases for some of llsimplestat.h
*
* $LicenseInfo:firstyear=2010&license=viewergpl$
*
* Copyright (c) 2010, Linden Research, Inc.
*
* $LicenseInfo:firstyear=2010&license=viewerlgpl$
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
* to you under the terms of the GNU General Public License, version 2.0
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
* Copyright (C) 2010, Linden Research, Inc.
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
* online at
* http://secondlifegrid.net/programs/open_source/licensing/flossexception
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
*
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
* and agree to abide by those obligations.
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
* COMPLETENESS OR PERFORMANCE.
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/

36
indra/newview/tests/llviewerassetstats_test.cpp
View File

@ -3,31 +3,25 @@
* @date 2010-10-28
* @brief Test cases for some of newview/llviewerassetstats.cpp
*
* $LicenseInfo:firstyear=2010&license=viewergpl$
*
* Copyright (c) 2010, Linden Research, Inc.
*
* $LicenseInfo:firstyear=2010&license=viewerlgpl$
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
* to you under the terms of the GNU General Public License, version 2.0
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
* Copyright (C) 2010, Linden Research, Inc.
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
* online at
* http://secondlifegrid.net/programs/open_source/licensing/flossexception
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
*
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
* and agree to abide by those obligations.
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
* COMPLETENESS OR PERFORMANCE.
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/