aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--linden/indra/llcommon/llversionviewer.h2
-rw-r--r--linden/indra/newview/llpreviewtexture.cpp3
-rw-r--r--linden/indra/newview/llvoiceclient.cpp180
-rw-r--r--linden/indra/newview/llvoiceclient.h10
-rw-r--r--linden/indra/newview/skins/default/xui/fr/floater_report_abuse.xml2
-rw-r--r--linden/indra/newview/skins/default/xui/ja/alerts.xml24
-rw-r--r--linden/indra/newview/skins/default/xui/ja/floater_about_land.xml4
-rw-r--r--linden/indra/newview/skins/default/xui/ja/floater_tools.xml4
-rw-r--r--linden/indra/newview/skins/default/xui/ja/menu_viewer.xml2
-rw-r--r--linden/indra/newview/skins/default/xui/ja/panel_region_general.xml2
-rw-r--r--linden/install.xml12
11 files changed, 122 insertions, 123 deletions
diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index 4f28752..258a5e2 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -34,7 +34,7 @@
34 34
35const S32 LL_VERSION_MAJOR = 1; 35const S32 LL_VERSION_MAJOR = 1;
36const S32 LL_VERSION_MINOR = 22; 36const S32 LL_VERSION_MINOR = 22;
37const S32 LL_VERSION_PATCH = 9; 37const S32 LL_VERSION_PATCH = 10;
38const S32 LL_VERSION_BUILD = 0; 38const S32 LL_VERSION_BUILD = 0;
39 39
40const char * const LL_CHANNEL = "Second Life Release"; 40const char * const LL_CHANNEL = "Second Life Release";
diff --git a/linden/indra/newview/llpreviewtexture.cpp b/linden/indra/newview/llpreviewtexture.cpp
index 929fd15..82331b5 100644
--- a/linden/indra/newview/llpreviewtexture.cpp
+++ b/linden/indra/newview/llpreviewtexture.cpp
@@ -302,7 +302,8 @@ void LLPreviewTexture::saveAs()
302 if( mLoadingFullImage ) return; 302 if( mLoadingFullImage ) return;
303 303
304 LLFilePicker& file_picker = LLFilePicker::instance(); 304 LLFilePicker& file_picker = LLFilePicker::instance();
305 if( !file_picker.getSaveFile( LLFilePicker::FFSAVE_TGA, LLDir::getScrubbedFileName(getItem()->getName())) ) 305 const LLViewerInventoryItem* item = getItem() ;
306 if( !file_picker.getSaveFile( LLFilePicker::FFSAVE_TGA, item ? LLDir::getScrubbedFileName(item->getName()) : LLStringUtil::null) )
306 { 307 {
307 // User canceled or we failed to acquire save file. 308 // User canceled or we failed to acquire save file.
308 return; 309 return;
diff --git a/linden/indra/newview/llvoiceclient.cpp b/linden/indra/newview/llvoiceclient.cpp
index 145132a..76ef87d 100644
--- a/linden/indra/newview/llvoiceclient.cpp
+++ b/linden/indra/newview/llvoiceclient.cpp
@@ -1362,10 +1362,13 @@ void LLVoiceClient::login(
1362 mVoiceSIPURIHostName = voice_sip_uri_hostname; 1362 mVoiceSIPURIHostName = voice_sip_uri_hostname;
1363 mVoiceAccountServerURI = voice_account_server_uri; 1363 mVoiceAccountServerURI = voice_account_server_uri;
1364 1364
1365 if((getState() >= stateLoggingIn) && (getState() < stateLoggedOut)) 1365 if(!mAccountHandle.empty())
1366 { 1366 {
1367 // Already logged in. This is an internal error. 1367 // Already logged in.
1368 LL_ERRS("Voice") << "Can't login again. Called from wrong state." << LL_ENDL; 1368 LL_WARNS("Voice") << "Called while already logged in." << LL_ENDL;
1369
1370 // Don't process another login.
1371 return;
1369 } 1372 }
1370 else if ( account_name != mAccountName ) 1373 else if ( account_name != mAccountName )
1371 { 1374 {
@@ -1431,12 +1434,16 @@ std::string LLVoiceClient::state2string(LLVoiceClient::state inState)
1431 1434
1432 switch(inState) 1435 switch(inState)
1433 { 1436 {
1437 CASE(stateDisableCleanup);
1434 CASE(stateDisabled); 1438 CASE(stateDisabled);
1435 CASE(stateStart); 1439 CASE(stateStart);
1436 CASE(stateDaemonLaunched); 1440 CASE(stateDaemonLaunched);
1437 CASE(stateConnecting); 1441 CASE(stateConnecting);
1442 CASE(stateConnected);
1438 CASE(stateIdle); 1443 CASE(stateIdle);
1439 CASE(stateNeedsProvision); 1444 CASE(stateMicTuningStart);
1445 CASE(stateMicTuningRunning);
1446 CASE(stateMicTuningStop);
1440 CASE(stateConnectorStart); 1447 CASE(stateConnectorStart);
1441 CASE(stateConnectorStarting); 1448 CASE(stateConnectorStarting);
1442 CASE(stateConnectorStarted); 1449 CASE(stateConnectorStarted);
@@ -1447,9 +1454,6 @@ std::string LLVoiceClient::state2string(LLVoiceClient::state inState)
1447 CASE(stateLoggedIn); 1454 CASE(stateLoggedIn);
1448 CASE(stateCreatingSessionGroup); 1455 CASE(stateCreatingSessionGroup);
1449 CASE(stateNoChannel); 1456 CASE(stateNoChannel);
1450 CASE(stateMicTuningStart);
1451 CASE(stateMicTuningRunning);
1452 CASE(stateMicTuningStop);
1453 CASE(stateJoiningSession); 1457 CASE(stateJoiningSession);
1454 CASE(stateSessionJoined); 1458 CASE(stateSessionJoined);
1455 CASE(stateRunning); 1459 CASE(stateRunning);
@@ -1466,7 +1470,6 @@ std::string LLVoiceClient::state2string(LLVoiceClient::state inState)
1466 CASE(stateJoinSessionFailed); 1470 CASE(stateJoinSessionFailed);
1467 CASE(stateJoinSessionFailedWaiting); 1471 CASE(stateJoinSessionFailedWaiting);
1468 CASE(stateJail); 1472 CASE(stateJail);
1469 CASE(stateMicTuningNoLogin);
1470 } 1473 }
1471 1474
1472#undef CASE 1475#undef CASE
@@ -1522,9 +1525,13 @@ void LLVoiceClient::stateMachine()
1522 { 1525 {
1523 updatePosition(); 1526 updatePosition();
1524 } 1527 }
1528 else if(mTuningMode)
1529 {
1530 // Tuning mode is special -- it needs to launch SLVoice even if voice is disabled.
1531 }
1525 else 1532 else
1526 { 1533 {
1527 if(getState() != stateDisabled) 1534 if((getState() != stateDisabled) && (getState() != stateDisableCleanup))
1528 { 1535 {
1529 // User turned off voice support. Send the cleanup messages, close the socket, and reset. 1536 // User turned off voice support. Send the cleanup messages, close the socket, and reset.
1530 if(!mConnected) 1537 if(!mConnected)
@@ -1534,16 +1541,10 @@ void LLVoiceClient::stateMachine()
1534 killGateway(); 1541 killGateway();
1535 } 1542 }
1536 1543
1537// leaveAudioSession();
1538 logout(); 1544 logout();
1539 // As of SDK version 4885, this should no longer be necessary. It will linger after the socket close if it needs to.
1540 // ms_sleep(2000);
1541 connectorShutdown(); 1545 connectorShutdown();
1542 closeSocket();
1543 deleteAllSessions();
1544 deleteAllBuddies();
1545 1546
1546 setState(stateDisabled); 1547 setState(stateDisableCleanup);
1547 } 1548 }
1548 } 1549 }
1549 1550
@@ -1579,9 +1580,24 @@ void LLVoiceClient::stateMachine()
1579 1580
1580 switch(getState()) 1581 switch(getState())
1581 { 1582 {
1583 //MARK: stateDisableCleanup
1584 case stateDisableCleanup:
1585 // Clean up and reset everything.
1586 closeSocket();
1587 deleteAllSessions();
1588 deleteAllBuddies();
1589
1590 mConnectorHandle.clear();
1591 mAccountHandle.clear();
1592 mAccountPassword.clear();
1593 mVoiceAccountServerURI.clear();
1594
1595 setState(stateDisabled);
1596 break;
1597
1582 //MARK: stateDisabled 1598 //MARK: stateDisabled
1583 case stateDisabled: 1599 case stateDisabled:
1584 if(mVoiceEnabled && (!mAccountName.empty() || mTuningMode)) 1600 if(mTuningMode || (mVoiceEnabled && !mAccountName.empty()))
1585 { 1601 {
1586 setState(stateStart); 1602 setState(stateStart);
1587 } 1603 }
@@ -1780,29 +1796,34 @@ void LLVoiceClient::stateMachine()
1780 1796
1781 mPump->addChain(readChain, NEVER_CHAIN_EXPIRY_SECS); 1797 mPump->addChain(readChain, NEVER_CHAIN_EXPIRY_SECS);
1782 1798
1783 setState(stateIdle); 1799 setState(stateConnected);
1784 } 1800 }
1785 1801
1786 break; 1802 break;
1787 1803
1788 //MARK: stateIdle 1804 //MARK: stateConnected
1789 case stateIdle: 1805 case stateConnected:
1790 // Initial devices query 1806 // Initial devices query
1791 getCaptureDevicesSendMessage(); 1807 getCaptureDevicesSendMessage();
1792 getRenderDevicesSendMessage(); 1808 getRenderDevicesSendMessage();
1793 1809
1794 mLoginRetryCount = 0; 1810 mLoginRetryCount = 0;
1795 1811
1796 setState(stateNeedsProvision); 1812 setState(stateIdle);
1797
1798 break; 1813 break;
1799 1814
1800 //MARK: stateNeedsProvision 1815 //MARK: stateIdle
1801 case stateNeedsProvision: 1816 case stateIdle:
1802 if(!mVoiceEnabled) 1817 // This is the idle state where we're connected to the daemon but haven't set up a connector yet.
1818 if(mTuningMode)
1803 { 1819 {
1804 // We were never logged in. This will shut down the connector. 1820 mTuningExitState = stateIdle;
1805 setState(stateLoggedOut); 1821 setState(stateMicTuningStart);
1822 }
1823 else if(!mVoiceEnabled)
1824 {
1825 // We never started up the connector. This will shut down the daemon.
1826 setState(stateConnectorStopped);
1806 } 1827 }
1807 else if(!mAccountName.empty()) 1828 else if(!mAccountName.empty())
1808 { 1829 {
@@ -1820,50 +1841,8 @@ void LLVoiceClient::stateMachine()
1820 } 1841 }
1821 } 1842 }
1822 } 1843 }
1823 else if(mTuningMode)
1824 {
1825 mTuningExitState = stateNeedsProvision;
1826 setState(stateMicTuningStart);
1827 }
1828 break;
1829
1830 //MARK: stateConnectorStart
1831 case stateConnectorStart:
1832 if(!mVoiceEnabled)
1833 {
1834 // We were never logged in. This will shut down the connector.
1835 setState(stateLoggedOut);
1836 }
1837 else if(!mVoiceAccountServerURI.empty())
1838 {
1839 connectorCreate();
1840 }
1841 else if(mTuningMode)
1842 {
1843 mTuningExitState = stateConnectorStart;
1844 setState(stateMicTuningStart);
1845 }
1846 break;
1847
1848 //MARK: stateConnectorStarting
1849 case stateConnectorStarting: // waiting for connector handle
1850 // connectorCreateResponse() will transition from here to stateConnectorStarted.
1851 break;
1852
1853 //MARK: stateConnectorStarted
1854 case stateConnectorStarted: // connector handle received
1855 if(!mVoiceEnabled)
1856 {
1857 // We were never logged in. This will shut down the connector.
1858 setState(stateLoggedOut);
1859 }
1860 else
1861 {
1862 // The connector is started. Send a login message.
1863 setState(stateNeedsLogin);
1864 }
1865 break; 1844 break;
1866 1845
1867 //MARK: stateMicTuningStart 1846 //MARK: stateMicTuningStart
1868 case stateMicTuningStart: 1847 case stateMicTuningStart:
1869 if(mUpdateTimer.hasExpired()) 1848 if(mUpdateTimer.hasExpired())
@@ -1898,7 +1877,7 @@ void LLVoiceClient::stateMachine()
1898 1877
1899 //MARK: stateMicTuningRunning 1878 //MARK: stateMicTuningRunning
1900 case stateMicTuningRunning: 1879 case stateMicTuningRunning:
1901 if(!mTuningMode || !mVoiceEnabled || mSessionTerminateRequested || mCaptureDeviceDirty || mRenderDeviceDirty) 1880 if(!mTuningMode || mCaptureDeviceDirty || mRenderDeviceDirty)
1902 { 1881 {
1903 // All of these conditions make us leave tuning mode. 1882 // All of these conditions make us leave tuning mode.
1904 setState(stateMicTuningStop); 1883 setState(stateMicTuningStop);
@@ -1952,7 +1931,39 @@ void LLVoiceClient::stateMachine()
1952 1931
1953 } 1932 }
1954 break; 1933 break;
1955 1934
1935 //MARK: stateConnectorStart
1936 case stateConnectorStart:
1937 if(!mVoiceEnabled)
1938 {
1939 // We were never logged in. This will shut down the connector.
1940 setState(stateLoggedOut);
1941 }
1942 else if(!mVoiceAccountServerURI.empty())
1943 {
1944 connectorCreate();
1945 }
1946 break;
1947
1948 //MARK: stateConnectorStarting
1949 case stateConnectorStarting: // waiting for connector handle
1950 // connectorCreateResponse() will transition from here to stateConnectorStarted.
1951 break;
1952
1953 //MARK: stateConnectorStarted
1954 case stateConnectorStarted: // connector handle received
1955 if(!mVoiceEnabled)
1956 {
1957 // We were never logged in. This will shut down the connector.
1958 setState(stateLoggedOut);
1959 }
1960 else
1961 {
1962 // The connector is started. Send a login message.
1963 setState(stateNeedsLogin);
1964 }
1965 break;
1966
1956 //MARK: stateLoginRetry 1967 //MARK: stateLoginRetry
1957 case stateLoginRetry: 1968 case stateLoginRetry:
1958 if(mLoginRetryCount == 0) 1969 if(mLoginRetryCount == 0)
@@ -2311,11 +2322,7 @@ void LLVoiceClient::stateMachine()
2311 2322
2312 //MARK: stateConnectorStopped 2323 //MARK: stateConnectorStopped
2313 case stateConnectorStopped: // connector stop received 2324 case stateConnectorStopped: // connector stop received
2314 // Clean up and reset everything. 2325 setState(stateDisableCleanup);
2315 closeSocket();
2316 deleteAllSessions();
2317 deleteAllBuddies();
2318 setState(stateDisabled);
2319 break; 2326 break;
2320 2327
2321 //MARK: stateConnectorFailed 2328 //MARK: stateConnectorFailed
@@ -2366,11 +2373,6 @@ void LLVoiceClient::stateMachine()
2366 // We have given up. Do nothing. 2373 // We have given up. Do nothing.
2367 break; 2374 break;
2368 2375
2369 //MARK: stateMicTuningNoLogin
2370 case stateMicTuningNoLogin:
2371 // *TODO: Implement me.
2372 LL_WARNS("Voice") << "stateMicTuningNoLogin not handled" << LL_ENDL;
2373 break;
2374 } 2376 }
2375 2377
2376 if(mAudioSession && mAudioSession->mParticipantsChanged) 2378 if(mAudioSession && mAudioSession->mParticipantsChanged)
@@ -2943,12 +2945,8 @@ void LLVoiceClient::daemonDied()
2943 // The daemon died, so the connection is gone. Reset everything and start over. 2945 // The daemon died, so the connection is gone. Reset everything and start over.
2944 LL_WARNS("Voice") << "Connection to vivox daemon lost. Resetting state."<< LL_ENDL; 2946 LL_WARNS("Voice") << "Connection to vivox daemon lost. Resetting state."<< LL_ENDL;
2945 2947
2946 closeSocket();
2947 deleteAllSessions();
2948 deleteAllBuddies();
2949
2950 // Try to relaunch the daemon 2948 // Try to relaunch the daemon
2951 setState(stateDisabled); 2949 setState(stateDisableCleanup);
2952} 2950}
2953 2951
2954void LLVoiceClient::giveUp() 2952void LLVoiceClient::giveUp()
@@ -5631,8 +5629,8 @@ void LLVoiceClient::setVoiceEnabled(bool enabled)
5631 } 5629 }
5632 else 5630 else
5633 { 5631 {
5634 // for now, leave active channel, to auto join when turning voice back on 5632 // Turning voice off looses your current channel -- this makes sure the UI isn't out of sync when you re-enable it.
5635 //LLVoiceChannel::getCurrentVoiceChannel->deactivate(); 5633 LLVoiceChannel::getCurrentVoiceChannel()->deactivate();
5636 } 5634 }
5637 } 5635 }
5638} 5636}
diff --git a/linden/indra/newview/llvoiceclient.h b/linden/indra/newview/llvoiceclient.h
index 9fc6a7d..13dd974 100644
--- a/linden/indra/newview/llvoiceclient.h
+++ b/linden/indra/newview/llvoiceclient.h
@@ -502,16 +502,19 @@ static void updatePosition(void);
502 // Note: if you change this list, please make corresponding changes to LLVoiceClient::state2string(). 502 // Note: if you change this list, please make corresponding changes to LLVoiceClient::state2string().
503 enum state 503 enum state
504 { 504 {
505 stateDisableCleanup,
505 stateDisabled, // Voice is turned off. 506 stateDisabled, // Voice is turned off.
506 stateStart, // Class is initialized, socket is created 507 stateStart, // Class is initialized, socket is created
507 stateDaemonLaunched, // Daemon has been launched 508 stateDaemonLaunched, // Daemon has been launched
508 stateConnecting, // connect() call has been issued 509 stateConnecting, // connect() call has been issued
510 stateConnected, // connection to the daemon has been made, send some initial setup commands.
509 stateIdle, // socket is connected, ready for messaging 511 stateIdle, // socket is connected, ready for messaging
510 stateNeedsProvision, // Need to do a ProvisionVoiceAccountRequest 512 stateMicTuningStart,
513 stateMicTuningRunning,
514 stateMicTuningStop,
511 stateConnectorStart, // connector needs to be started 515 stateConnectorStart, // connector needs to be started
512 stateConnectorStarting, // waiting for connector handle 516 stateConnectorStarting, // waiting for connector handle
513 stateConnectorStarted, // connector handle received 517 stateConnectorStarted, // connector handle received
514 stateMicTuningNoLogin, // mic tuning before login
515 stateLoginRetry, // need to retry login (failed due to changing password) 518 stateLoginRetry, // need to retry login (failed due to changing password)
516 stateLoginRetryWait, // waiting for retry timer 519 stateLoginRetryWait, // waiting for retry timer
517 stateNeedsLogin, // send login request 520 stateNeedsLogin, // send login request
@@ -519,9 +522,6 @@ static void updatePosition(void);
519 stateLoggedIn, // account handle received 522 stateLoggedIn, // account handle received
520 stateCreatingSessionGroup, // Creating the main session group 523 stateCreatingSessionGroup, // Creating the main session group
521 stateNoChannel, // 524 stateNoChannel, //
522 stateMicTuningStart,
523 stateMicTuningRunning,
524 stateMicTuningStop,
525 stateJoiningSession, // waiting for session handle 525 stateJoiningSession, // waiting for session handle
526 stateSessionJoined, // session handle received 526 stateSessionJoined, // session handle received
527 stateRunning, // in session, steady state 527 stateRunning, // in session, steady state
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_report_abuse.xml b/linden/indra/newview/skins/default/xui/fr/floater_report_abuse.xml
index 1fbc727..c9b065c 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_report_abuse.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_report_abuse.xml
@@ -172,7 +172,7 @@
172 <text name="bug_aviso"> 172 <text name="bug_aviso">
173 Indiquez la date, le lieu, la nature de l&apos;infraction, ainsi que 173 Indiquez la date, le lieu, la nature de l&apos;infraction, ainsi que
174tout chat ou IM relatif à l&apos;infraction, en étant aussi précis 174tout chat ou IM relatif à l&apos;infraction, en étant aussi précis
175que possible. Pensez à indiquer un objet. 175que possible. Pensez à indiquer un objet si possible.
176 </text> 176 </text>
177 <text bottom_delta="-16" name="incomplete_title"> 177 <text bottom_delta="-16" name="incomplete_title">
178 Remarque : les rapports incomplets ne feront pas l&apos;objet d&apos;une 178 Remarque : les rapports incomplets ne feront pas l&apos;objet d&apos;une
diff --git a/linden/indra/newview/skins/default/xui/ja/alerts.xml b/linden/indra/newview/skins/default/xui/ja/alerts.xml
index f4512c2..30ba935 100644
--- a/linden/indra/newview/skins/default/xui/ja/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/ja/alerts.xml
@@ -2797,10 +2797,10 @@ F1キーを押してください。
2797 </alert> 2797 </alert>
2798 <alert name="WebLaunchExternalTarget"> 2798 <alert name="WebLaunchExternalTarget">
2799 <message name="message"> 2799 <message name="message">
2800 お使いのシステムのウェブ・ブラウザ開いて、この内容を表示しますか? 2800 お使いのシステムのウェブ・ブラウザを開いて、この内容を表示しますか?
2801 </message> 2801 </message>
2802 <ignore name="ignore"> 2802 <ignore name="ignore">
2803 お使いのシステムのブラウザーを開いてウェブ・ページを表示しようとしたとき 2803 お使いのシステムのブラウザを開いてウェブ・ページを表示しようとしたとき
2804 </ignore> 2804 </ignore>
2805 <option name="Open"> 2805 <option name="Open">
2806 OK 2806 OK
@@ -2814,7 +2814,7 @@ F1キーを押してください。
2814 www.secondlife.comに移動してアカウントを管理しますか？ 2814 www.secondlife.comに移動してアカウントを管理しますか？
2815 </message> 2815 </message>
2816 <ignore name="ignore"> 2816 <ignore name="ignore">
2817 口座を管理するため、ウェブ・ブラウザ起動するとき 2817 カウント管理するため、ウェブ・ブラウザを起動するとき
2818 </ignore> 2818 </ignore>
2819 <option name="OK"> 2819 <option name="OK">
2820 OK 2820 OK
@@ -2853,10 +2853,10 @@ F1キーを押してください。
2853 </alert> 2853 </alert>
2854 <alert name="WebLaunchQAWiki"> 2854 <alert name="WebLaunchQAWiki">
2855 <message name="message"> 2855 <message name="message">
2856 [SECOND_LIFE] QA Wikiをご覧ください。 2856 [SECOND_LIFE] 品質保証関連Wikiをご覧ください。
2857 </message> 2857 </message>
2858 <ignore name="ignore"> 2858 <ignore name="ignore">
2859 QA Wikiを閲覧するためにウェブ・ブラウザを起動するにあたって 2859 品質保証関連Wikiを閲覧するためにウェブ・ブラウザを起動するにあたって
2860 </ignore> 2860 </ignore>
2861 <option name="Gotopage"> 2861 <option name="Gotopage">
2862 OK 2862 OK
@@ -2895,10 +2895,10 @@ F1キーを押してください。
2895 </alert> 2895 </alert>
2896 <alert name="WebLaunchForums"> 2896 <alert name="WebLaunchForums">
2897 <message name="message"> 2897 <message name="message">
2898 最新のヒントおよびトリックについては、[SECOND_LIFE]の知識ベースを検索してください。 2898 最新のヒントおよびトリックについては、[SECOND_LIFE]のナレッジベースを検索してください。
2899 </message> 2899 </message>
2900 <ignore name="ignore"> 2900 <ignore name="ignore">
2901 知識ベースを表示するため、ウェブ・ブラウザ起動するとき 2901 レッジースを表示するため、ウェブ・ブラウザを起動するとき
2902 </ignore> 2902 </ignore>
2903 <option name="Gotopage"> 2903 <option name="Gotopage">
2904 OK 2904 OK
@@ -2912,7 +2912,7 @@ F1キーを押してください。
2912 [SECOND_LIFE]サポートにコンタクト 2912 [SECOND_LIFE]サポートにコンタクト
2913 </message> 2913 </message>
2914 <ignore name="ignore"> 2914 <ignore name="ignore">
2915 サポートに連絡するため、ウェブ・ブラウザ起動するとき 2915 サポートに連絡するため、ウェブ・ブラウザを起動するとき
2916 </ignore> 2916 </ignore>
2917 <option name="Gotopage"> 2917 <option name="Gotopage">
2918 OK 2918 OK
@@ -2926,7 +2926,7 @@ F1キーを押してください。
2926 Linden公式ブログで、最新のニュースや情報を入手してください。 2926 Linden公式ブログで、最新のニュースや情報を入手してください。
2927 </message> 2927 </message>
2928 <ignore name="ignore"> 2928 <ignore name="ignore">
2929 ブログを表示するため、ウェブ・ブラウザ起動するとき 2929 ブログを表示するため、ウェブ・ブラウザを起動するとき
2930 </ignore> 2930 </ignore>
2931 <option name="Gotopage"> 2931 <option name="Gotopage">
2932 OK 2932 OK
@@ -2940,7 +2940,7 @@ F1キーを押してください。
2940 スクリプトガイドを開いて、スクリプトのヘルプを参照しますか？ 2940 スクリプトガイドを開いて、スクリプトのヘルプを参照しますか？
2941 </message> 2941 </message>
2942 <ignore name="ignore"> 2942 <ignore name="ignore">
2943 LSLガイドを表示するため、ウェブ・ブラウザ起動するとき 2943 LSLガイドを表示するため、ウェブ・ブラウザを起動するとき
2944 </ignore> 2944 </ignore>
2945 <option name="Gotopage"> 2945 <option name="Gotopage">
2946 OK 2946 OK
@@ -2954,7 +2954,7 @@ F1キーを押してください。
2954 LSLポータルを開いてスクリプトのヘルプを参照しますか？ 2954 LSLポータルを開いてスクリプトのヘルプを参照しますか？
2955 </message> 2955 </message>
2956 <ignore name="ignore"> 2956 <ignore name="ignore">
2957 LSLポータルを表示するために、ウェブ・ブラウザ起動するとき 2957 LSLポータルを表示するために、ウェブ・ブラウザを起動するとき
2958 </ignore> 2958 </ignore>
2959 <option name="Gotopage"> 2959 <option name="Gotopage">
2960 ページに移動 2960 ページに移動
@@ -4154,7 +4154,7 @@ Linden社所有のメインランドの不動産での太陽の位置に
4154 SecondLifeウェブ・ページを開いてアカウント履歴を確認しますか？ 4154 SecondLifeウェブ・ページを開いてアカウント履歴を確認しますか？
4155 </message> 4155 </message>
4156 <ignore name="ignore"> 4156 <ignore name="ignore">
4157 座歴のウェブ・ページをロードするとき 4157 アカウント履歴のウェブ・ページをロードするとき
4158 </ignore> 4158 </ignore>
4159 <option name="Gotopage"> 4159 <option name="Gotopage">
4160 ページに移動 4160 ページに移動
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_about_land.xml b/linden/indra/newview/skins/default/xui/ja/floater_about_land.xml
index c1d944b..15a4c91 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_about_land.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_about_land.xml
@@ -61,9 +61,9 @@
61 <text length="1" name="DwellText" type="string"> 61 <text length="1" name="DwellText" type="string">
62 誤 62 誤
63 </text> 63 </text>
64 <button label="土地を購入..." label_selected="土地を購入..." name="Buy Land..."/> 64 <button label="土地を購入..." label_selected="土地を購入..." name="Buy Land..." width="125" left="130"/>
65 <button label="グループ用に購入..." label_selected="グループ用に購入..." name="Buy For Group..."/> 65 <button label="グループ用に購入..." label_selected="グループ用に購入..." name="Buy For Group..."/>
66 <button label="入場許可を購入..." label_selected="入場許可を購入..." name="Buy Pass..." tool_tip="この土地への一時的なアクセスを許可します。"/> 66 <button label="入場許可を購入..." label_selected="入場許可を購入..." name="Buy Pass..." tool_tip="この土地への一時的なアクセスを許可します。" width="125" left="130"/>
67 <button label="土地を放棄..." label_selected="土地を放棄..." name="Abandon Land..."/> 67 <button label="土地を放棄..." label_selected="土地を放棄..." name="Abandon Land..."/>
68 <button label="土地開拓..." label_selected="土地開拓..." name="Reclaim Land..."/> 68 <button label="土地開拓..." label_selected="土地開拓..." name="Reclaim Land..."/>
69 <button label="Lindenセール..." label_selected="Lindenセール..." name="Linden Sale..." tool_tip="土地が所有されており、コンテンツが設定されている必要があります。オークションの対象になっていないことも必要条件です。"/> 69 <button label="Lindenセール..." label_selected="Lindenセール..." name="Linden Sale..." tool_tip="土地が所有されており、コンテンツが設定されている必要があります。オークションの対象になっていないことも必要条件です。"/>
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_tools.xml b/linden/indra/newview/skins/default/xui/ja/floater_tools.xml
index d88f0b8..ab20496 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_tools.xml
@@ -76,7 +76,7 @@
76 <check_box label="土地を隆起させる" name="radio raise" /> 76 <check_box label="土地を隆起させる" name="radio raise" />
77 <check_box label="土地を低くする" name="radio lower" /> 77 <check_box label="土地を低くする" name="radio lower" />
78 <check_box label="土地を滑らかにする" name="radio smooth" /> 78 <check_box label="土地を滑らかにする" name="radio smooth" />
79 <check_box label="土地を荒す" name="radio noise" /> 79 <check_box label="土地を凸凹する" name="radio noise" />
80 <check_box label="土地を元に戻す" name="radio revert" /> 80 <check_box label="土地を元に戻す" name="radio revert" />
81 <combo_box name="combobox brush size"> 81 <combo_box name="combobox brush size">
82 <combo_item name="Small"> 82 <combo_item name="Small">
@@ -558,7 +558,7 @@
558 </combo_item> 558 </combo_item>
559 </combo_box> 559 </combo_box>
560 <text name="tex scale"> 560 <text name="tex scale">
561 ごとに繰り返す 561 ごとに繰り返す
562 </text> 562 </text>
563 <spinner label="水平（U）" name="TexScaleU" /> 563 <spinner label="水平（U）" name="TexScaleU" />
564 <check_box label="反転" name="checkbox flip s" /> 564 <check_box label="反転" name="checkbox flip s" />
diff --git a/linden/indra/newview/skins/default/xui/ja/menu_viewer.xml b/linden/indra/newview/skins/default/xui/ja/menu_viewer.xml
index bc7b074..af870a0 100644
--- a/linden/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -132,7 +132,7 @@
132 <menu_item_call label="正午" name="Noon"/> 132 <menu_item_call label="正午" name="Noon"/>
133 <menu_item_call label="日没" name="Sunset"/> 133 <menu_item_call label="日没" name="Sunset"/>
134 <menu_item_call label="深夜" name="Midnight"/> 134 <menu_item_call label="深夜" name="Midnight"/>
135 <menu_item_call label="地域ォルト戻す" name="Revert to Region Default"/> 135 <menu_item_call label="地域標準設定に戻す" name="Revert to Region Default"/>
136 <menu_item_separator label="-----------" name="separator"/> 136 <menu_item_separator label="-----------" name="separator"/>
137 <menu_item_call label="環境編集" name="Environment Editor"/> 137 <menu_item_call label="環境編集" name="Environment Editor"/>
138 </menu> 138 </menu>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_region_general.xml b/linden/indra/newview/skins/default/xui/ja/panel_region_general.xml
index cd1b7ce..a0e72b3 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_region_general.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_region_general.xml
@@ -27,7 +27,7 @@
27 <check_box label="土地の検索表示をブロック" name="block_parcel_search_check" 27 <check_box label="土地の検索表示をブロック" name="block_parcel_search_check"
28 tool_tip="検索結果で、この地域と区画を人に見せる" /> 28 tool_tip="検索結果で、この地域と区画を人に見せる" />
29 <button label="?" name="parcel_search_help" /> 29 <button label="?" name="parcel_search_help" />
30 <spinner label="人物制限" name="agent_limit_spin" /> 30 <spinner label="バター数上限" name="agent_limit_spin" />
31 <button label="?" name="agent_limit_help" /> 31 <button label="?" name="agent_limit_help" />
32 <spinner label="物体ボーナス" name="object_bonus_spin" /> 32 <spinner label="物体ボーナス" name="object_bonus_spin" />
33 <button label="?" name="object_bonus_help" /> 33 <button label="?" name="object_bonus_help" />
diff --git a/linden/install.xml b/linden/install.xml
index effa413..1eb6316 100644
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -1443,23 +1443,23 @@ anguage Infrstructure (CLI) international standard</string>
1443 <key>darwin</key> 1443 <key>darwin</key>
1444 <map> 1444 <map>
1445 <key>md5sum</key> 1445 <key>md5sum</key>
1446 <string>c01efc0182d6f4b665ee136767830fc1</string> 1446 <string>352eae0cd76bb561da7b4183fc5a2857</string>
1447 <key>url</key> 1447 <key>url</key>
1448 <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-2.1.3010.6135-darwin-20090210.tar.bz2</uri> 1448 <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-2.1.3010.6151-darwin-20090218.tar.bz2</uri>
1449 </map> 1449 </map>
1450 <key>linux</key> 1450 <key>linux</key>
1451 <map> 1451 <map>
1452 <key>md5sum</key> 1452 <key>md5sum</key>
1453 <string>58dcd6db82b5b92611e890c954af4901</string> 1453 <string>2279e1637568a837d9a4971cd27ed5f7</string>
1454 <key>url</key> 1454 <key>url</key>
1455 <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-2.1.3010.6135-linux-20090210.tar.bz2</uri> 1455 <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-2.1.3010.6151-linux-20090218.tar.bz2</uri>
1456 </map> 1456 </map>
1457 <key>windows</key> 1457 <key>windows</key>
1458 <map> 1458 <map>
1459 <key>md5sum</key> 1459 <key>md5sum</key>
1460 <string>599659e6d0374533a6ac8d2e2d360c2c</string> 1460 <string>311bedab0abbd3a0ddf07216711af0ea</string>
1461 <key>url</key> 1461 <key>url</key>
1462 <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-2.1.3010.6135-windows-20090210.tar.bz2</uri> 1462 <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-2.1.3010.6151-windows-20090218.tar.bz2</uri>
1463 </map> 1463 </map>
1464 </map> 1464 </map>
1465 </map> 1465 </map>
generated by cgit v1.1 at 2024-12-29 06:46:05 +0000