aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorElektra Hesse2010-09-04 22:30:44 +0200
committerElektra Hesse2010-09-04 22:30:44 +0200
commit0304b1c43d1752656dc7215bd07079c1379c0428 (patch)
tree6709476bd84adadcb9aef599743058a23c8c7c51
parentFixed Boost.cmake to correctly find the boost_system lib on mac (diff)
parentChanged version to 'Experimental 2010.09.04'. (diff)
downloadmeta-impy-0304b1c43d1752656dc7215bd07079c1379c0428.zip
meta-impy-0304b1c43d1752656dc7215bd07079c1379c0428.tar.gz
meta-impy-0304b1c43d1752656dc7215bd07079c1379c0428.tar.bz2
meta-impy-0304b1c43d1752656dc7215bd07079c1379c0428.tar.xz
Merge branch 'weekly' of git://github.com/mccabe/imprudence into weekly
Diffstat
-rw-r--r--linden/indra/cmake/ViewerArtwork.cmake2
-rw-r--r--linden/indra/cmake/ViewerMiscLibs.cmake3
-rw-r--r--linden/indra/newview/English.lproj/InfoPlist.strings4
-rw-r--r--linden/indra/newview/Info-Imprudence.plist2
-rw-r--r--linden/indra/newview/app_settings/settings.xml12
-rw-r--r--linden/indra/newview/app_settings/viewerversion.xml4
-rw-r--r--linden/indra/newview/floaterlocalassetbrowse.cpp10
-rw-r--r--linden/indra/newview/llappviewer.cpp2
-rw-r--r--linden/indra/newview/llviewerimagelist.cpp22
-rw-r--r--linden/indra/newview/res/viewerRes.rc8
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_about.xml2
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml9
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml9
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_preview_gesture.xml8
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/fonts.xml16
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml4
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml4
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_toolbar.xml4
-rwxr-xr-xlinden/indra/newview/viewer_manifest.py24
-rwxr-xr-xlinden/install.xml68
20 files changed, 155 insertions, 62 deletions
diff --git a/linden/indra/cmake/ViewerArtwork.cmake b/linden/indra/cmake/ViewerArtwork.cmake
index f01109a..20210fc 100644
--- a/linden/indra/cmake/ViewerArtwork.cmake
+++ b/linden/indra/cmake/ViewerArtwork.cmake
@@ -7,8 +7,10 @@ include(Prebuilt)
7 7
8if (NOT STANDALONE) 8if (NOT STANDALONE)
9 use_prebuilt_binary(artwork) 9 use_prebuilt_binary(artwork)
10 use_prebuilt_binary(fonts)
10else (NOT STANDALONE) 11else (NOT STANDALONE)
11 set(STANDALONE OFF) 12 set(STANDALONE OFF)
12 use_prebuilt_binary(artwork) 13 use_prebuilt_binary(artwork)
14 use_prebuilt_binary(fonts)
13 set(STANDALONE ON) 15 set(STANDALONE ON)
14endif (NOT STANDALONE) 16endif (NOT STANDALONE)
diff --git a/linden/indra/cmake/ViewerMiscLibs.cmake b/linden/indra/cmake/ViewerMiscLibs.cmake
index 7bd306b..4a62ebd 100644
--- a/linden/indra/cmake/ViewerMiscLibs.cmake
+++ b/linden/indra/cmake/ViewerMiscLibs.cmake
@@ -4,6 +4,9 @@ include(Prebuilt)
4if (NOT STANDALONE) 4if (NOT STANDALONE)
5 use_prebuilt_binary(libuuid) 5 use_prebuilt_binary(libuuid)
6 use_prebuilt_binary(vivox) 6 use_prebuilt_binary(vivox)
7 if(LINUX64)
8 use_prebuilt_binary(32bitcompatibilitylibs)
9 endif(LINUX64)
7 use_prebuilt_binary(fontconfig) 10 use_prebuilt_binary(fontconfig)
8endif(NOT STANDALONE) 11endif(NOT STANDALONE)
9 12
diff --git a/linden/indra/newview/English.lproj/InfoPlist.strings b/linden/indra/newview/English.lproj/InfoPlist.strings
index d2e24bf..8f9c4f5 100644
--- a/linden/indra/newview/English.lproj/InfoPlist.strings
+++ b/linden/indra/newview/English.lproj/InfoPlist.strings
@@ -1,5 +1,5 @@
1/* Localized versions of Info.plist keys */ 1/* Localized versions of Info.plist keys */
2 2
3CFBundleName = "Imprudence"; 3CFBundleName = "Imprudence";
4CFBundleShortVersionString = "Imprudence Weekly 2010-06-26"; 4CFBundleShortVersionString = "Imprudence Experimental 2010.09.04";
5CFBundleGetInfoString = "Imprudence Weekly 2010-06-26"; 5CFBundleGetInfoString = "Imprudence Experimental 2010.09.04";
diff --git a/linden/indra/newview/Info-Imprudence.plist b/linden/indra/newview/Info-Imprudence.plist
index b6f834d..e9728f8 100644
--- a/linden/indra/newview/Info-Imprudence.plist
+++ b/linden/indra/newview/Info-Imprudence.plist
@@ -32,7 +32,7 @@
32 </dict> 32 </dict>
33 </array> 33 </array>
34 <key>CFBundleVersion</key> 34 <key>CFBundleVersion</key>
35 <string>Weekly 2010-06-26</string> 35 <string>Experimental 2010.09.04</string>
36 <key>CSResourcesFileMapped</key> 36 <key>CSResourcesFileMapped</key>
37 <true/> 37 <true/>
38</dict> 38</dict>
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 65a6c00..41ec05d 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -68,7 +68,7 @@
68 <key>Type</key> 68 <key>Type</key>
69 <string>String</string> 69 <string>String</string>
70 <key>Value</key> 70 <key>Value</key>
71 <string>http://www.imprudenceviewer.org</string> 71 <string>http://imprudenceviewer.org</string>
72 </map> 72 </map>
73 <key>BrowserLastVisited</key> 73 <key>BrowserLastVisited</key>
74 <map> 74 <map>
@@ -582,7 +582,7 @@
582 <key>Type</key> 582 <key>Type</key>
583 <string>Boolean</string> 583 <string>Boolean</string>
584 <key>Value</key> 584 <key>Value</key>
585 <integer>1</integer> 585 <integer>0</integer>
586 </map> 586 </map>
587 <key>SpeedRezInterval</key> 587 <key>SpeedRezInterval</key>
588 <map> 588 <map>
@@ -1535,7 +1535,7 @@
1535 <key>Type</key> 1535 <key>Type</key>
1536 <string>String</string> 1536 <string>String</string>
1537 <key>Value</key> 1537 <key>Value</key>
1538 <string>http://www.imprudenceviewer.org/app/dics/</string> 1538 <string>http://imprudenceviewer.org/app/dics/</string>
1539 </map> 1539 </map>
1540 <key>EmeraldEnableAutoCorrect</key> 1540 <key>EmeraldEnableAutoCorrect</key>
1541 <map> 1541 <map>
@@ -6131,7 +6131,7 @@
6131 <key>Type</key> 6131 <key>Type</key>
6132 <string>String</string> 6132 <string>String</string>
6133 <key>Value</key> 6133 <key>Value</key>
6134 <string>LiberationSans-Regular.ttf</string> 6134 <string>DejaVuSansCondensed.ttf</string>
6135 </map> 6135 </map>
6136 <key>FontSansSerifBundledFallback</key> 6136 <key>FontSansSerifBundledFallback</key>
6137 <map> 6137 <map>
@@ -6153,7 +6153,7 @@
6153 <key>Type</key> 6153 <key>Type</key>
6154 <string>String</string> 6154 <string>String</string>
6155 <key>Value</key> 6155 <key>Value</key>
6156 <string>LiberationSans-Bold.ttf</string> 6156 <string>DejaVuSansCondensed-Bold.ttf</string>
6157 </map> 6157 </map>
6158 <key>FontSansSerifFallback</key> 6158 <key>FontSansSerifFallback</key>
6159 <map> 6159 <map>
@@ -12283,7 +12283,7 @@
12283 <key>Type</key> 12283 <key>Type</key>
12284 <string>F32</string> 12284 <string>F32</string>
12285 <key>Value</key> 12285 <key>Value</key>
12286 <real>1.002</real> 12286 <real>1.0</real>
12287 </map> 12287 </map>
12288 <key>UISndAlert</key> 12288 <key>UISndAlert</key>
12289 <map> 12289 <map>
diff --git a/linden/indra/newview/app_settings/viewerversion.xml b/linden/indra/newview/app_settings/viewerversion.xml
index 37cfe0a..3b1a7df 100644
--- a/linden/indra/newview/app_settings/viewerversion.xml
+++ b/linden/indra/newview/app_settings/viewerversion.xml
@@ -14,12 +14,12 @@ need to be changed manually - MC
14 <viewer version_major="1" /> 14 <viewer version_major="1" />
15 15
16 <!--int--> 16 <!--int-->
17 <viewer version_minor="3" /> 17 <viewer version_minor="4" />
18 18
19 <!--int--> 19 <!--int-->
20 <viewer version_patch="0" /> 20 <viewer version_patch="0" />
21 21
22 <!--string--> 22 <!--string-->
23 <viewer version_test="Weekly: 2010-08-21" /> 23 <viewer version_test="Experimental 2010.09.04" />
24 24
25</viewer_version> 25</viewer_version>
diff --git a/linden/indra/newview/floaterlocalassetbrowse.cpp b/linden/indra/newview/floaterlocalassetbrowse.cpp
index 337a5e6..0ff24ca 100644
--- a/linden/indra/newview/floaterlocalassetbrowse.cpp
+++ b/linden/indra/newview/floaterlocalassetbrowse.cpp
@@ -106,8 +106,8 @@ LocalBitmap::LocalBitmap(std::string fullpath)
106 /* taking care of basic properties */ 106 /* taking care of basic properties */
107 this->id.generate(); 107 this->id.generate();
108 this->filename = fullpath; 108 this->filename = fullpath;
109 this->linkstatus = LINK_OFF; 109 this->linkstatus = LINK_ON;
110 this->keep_updating = false; 110 this->keep_updating = true;
111 this->shortname = gDirUtilp->getBaseFileName(this->filename, true); 111 this->shortname = gDirUtilp->getBaseFileName(this->filename, true);
112 this->bitmap_type = TYPE_TEXTURE; 112 this->bitmap_type = TYPE_TEXTURE;
113 this->sculpt_dirty = false; 113 this->sculpt_dirty = false;
@@ -791,8 +791,8 @@ FloaterLocalAssetBrowser::FloaterLocalAssetBrowser()
791 // checkbox callbacks 791 // checkbox callbacks
792 mUpdateChkBox->setCommitCallback(onClickUpdateChkbox); 792 mUpdateChkBox->setCommitCallback(onClickUpdateChkbox);
793 793
794 mUpdateChkBox->set(true); 794 mUpdateChkBox->set(false);
795 mUploadBtn->setLabelArg("[UPLOADFEE]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol()); 795 mUploadBtn->setLabelArg("[UPLOADFEE]", gHippoGridManager->getConnectedGrid()->getUploadFee());
796} 796}
797 797
798void FloaterLocalAssetBrowser::show(void*) 798void FloaterLocalAssetBrowser::show(void*)
@@ -915,7 +915,6 @@ void FloaterLocalAssetBrowser::UpdateRightSide()
915 sLFInstance->mTypeComboBox->selectNthItem( unit->getType() ); 915 sLFInstance->mTypeComboBox->selectNthItem( unit->getType() );
916 916
917 sLFInstance->mTextureView->setEnabled(true); 917 sLFInstance->mTextureView->setEnabled(true);
918 sLFInstance->mUpdateChkBox->set(true);
919 sLFInstance->mUpdateChkBox->setEnabled(true); 918 sLFInstance->mUpdateChkBox->setEnabled(true);
920 sLFInstance->mTypeComboBox->setEnabled(true); 919 sLFInstance->mTypeComboBox->setEnabled(true);
921 } 920 }
@@ -924,7 +923,6 @@ void FloaterLocalAssetBrowser::UpdateRightSide()
924 { 923 {
925 sLFInstance->mTextureView->setImageAssetID( NO_IMAGE ); 924 sLFInstance->mTextureView->setImageAssetID( NO_IMAGE );
926 sLFInstance->mTextureView->setEnabled( false ); 925 sLFInstance->mTextureView->setEnabled( false );
927 sLFInstance->mUpdateChkBox->set( false );
928 sLFInstance->mUpdateChkBox->setEnabled( false ); 926 sLFInstance->mUpdateChkBox->setEnabled( false );
929 927
930 sLFInstance->mTypeComboBox->selectFirstItem(); 928 sLFInstance->mTypeComboBox->selectFirstItem();
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 52535bc..b3f3e59 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -3229,7 +3229,7 @@ void LLAppViewer::badNetworkHandler()
3229 "the issue. \n" 3229 "the issue. \n"
3230 " \n" 3230 " \n"
3231 "If the problem continues, please report the issue at: \n" 3231 "If the problem continues, please report the issue at: \n"
3232 "www.imprudenceviewer.org" << grid_support_msg; 3232 "http://imprudenceviewer.org" << grid_support_msg;
3233 forceDisconnect(message.str()); 3233 forceDisconnect(message.str());
3234} 3234}
3235 3235
diff --git a/linden/indra/newview/llviewerimagelist.cpp b/linden/indra/newview/llviewerimagelist.cpp
index 518f6d4..703d233 100644
--- a/linden/indra/newview/llviewerimagelist.cpp
+++ b/linden/indra/newview/llviewerimagelist.cpp
@@ -168,7 +168,27 @@ void LLViewerImageList::doPreloadImages()
168 image->setAddressMode(LLTexUnit::TAM_WRAP); 168 image->setAddressMode(LLTexUnit::TAM_WRAP);
169 mImagePreloads.insert(image); 169 mImagePreloads.insert(image);
170 } 170 }
171 171
172 std::string id;
173
174 // Preload default avatar eyes
175 id = gSavedSettings.getString("UIImgDefaultEyesUUID");
176 image = getImageFromFile(id+".j2c",MIPMAP_YES,IMMEDIATE_YES,0,0,LLUUID(id));
177 if (image)
178 {
179 image->setAddressMode(LLTexUnit::TAM_WRAP);
180 mImagePreloads.insert(image);
181 }
182
183 // Preload default avatar hair
184 id = gSavedSettings.getString("UIImgDefaultHairUUID");
185 image = getImageFromFile(id+".j2c",MIPMAP_YES,IMMEDIATE_YES,0,0,LLUUID(id));
186 if (image)
187 {
188 image->setAddressMode(LLTexUnit::TAM_WRAP);
189 mImagePreloads.insert(image);
190 }
191
172} 192}
173 193
174static std::string get_texture_list_name() 194static std::string get_texture_list_name()
diff --git a/linden/indra/newview/res/viewerRes.rc b/linden/indra/newview/res/viewerRes.rc
index a3fafc6..45e50c9 100644
--- a/linden/indra/newview/res/viewerRes.rc
+++ b/linden/indra/newview/res/viewerRes.rc
@@ -155,12 +155,12 @@ BEGIN
155 BLOCK "040904b0" 155 BLOCK "040904b0"
156 BEGIN 156 BEGIN
157 VALUE "CompanyName", "Imprudence Viewer Project" 157 VALUE "CompanyName", "Imprudence Viewer Project"
158 VALUE "FileDescription", "Imprudence Weekly" 158 VALUE "FileDescription", "Imprudence Experimental"
159 VALUE "FileVersion", "2010-06-26" 159 VALUE "FileVersion", "2010.09.04"
160 VALUE "InternalName", "Imprudence Weekly" 160 VALUE "InternalName", "Imprudence Experimental"
161 VALUE "OriginalFilename", "Imprudence.exe" 161 VALUE "OriginalFilename", "Imprudence.exe"
162 VALUE "ProductName", "Imprudence Weekly" 162 VALUE "ProductName", "Imprudence Weekly"
163 VALUE "ProductVersion", "2010-06-26" 163 VALUE "ProductVersion", "2010.09.04"
164 END 164 END
165 END 165 END
166 BLOCK "VarFileInfo" 166 BLOCK "VarFileInfo"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
index 1370051..1ba9c40 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
@@ -9,7 +9,7 @@
9 word_wrap="true"> 9 word_wrap="true">
10 The Imprudence Viewer was rocked hard by: 10 The Imprudence Viewer was rocked hard by:
11 Jacek Antonelli, McCabe Maxsted, and Armin Weatherwax. 11 Jacek Antonelli, McCabe Maxsted, and Armin Weatherwax.
12 http://www.imprudenceviewer.org 12 http://imprudenceviewer.org
13 13
14 Imprudence is so awesome thanks to contributions from many generous people: 14 Imprudence is so awesome thanks to contributions from many generous people:
15 15
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
index 87e1dae..74fe708 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
@@ -81,11 +81,10 @@
81 <check_box bottom_delta="-15" enabled="true" follows="left|top" font="SansSerifSmall" 81 <check_box bottom_delta="-15" enabled="true" follows="left|top" font="SansSerifSmall"
82 height="20" initial_value="false" label="Translate chat (powered by Google)" left_delta="0" 82 height="20" initial_value="false" label="Translate chat (powered by Google)" left_delta="0"
83 name="translate chat" radio_style="false" width="100" /> 83 name="translate chat" radio_style="false" width="100" />
84 <button bottom_delta="7" follows="right|top" height="20" label="&lt; &lt;" 84 <button name="toggle_active_speakers_btn"
85 label_selected="&gt; &gt;" left="272" name="toggle_active_speakers_btn" 85 label="&lt;&lt;" label_selected="&gt;&gt;" follows="right|top"
86 right="305" 86 bottom_delta="0" left="262" right="305" height="20"
87 tool_tip="Click here to show list of active participants in this IM session." 87 tool_tip="Toggle list of active participants in this IM session." />
88 width="70" />
89 <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" 88 <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
90 bottom="28" embedded_items="false" enabled="false" 89 bottom="28" embedded_items="false" enabled="false"
91 follows="left|top|right|bottom" font="SansSerif" height="74" left="5" 90 follows="left|top|right|bottom" font="SansSerif" height="74" left="5"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
index 4c9ba2a..072ac14 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
@@ -58,11 +58,10 @@
58 image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" 58 image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
59 label="End Call" left_delta="0" name="end_call_btn" pad_right="12" 59 label="End Call" left_delta="0" name="end_call_btn" pad_right="12"
60 visible="false" width="92" /> 60 visible="false" width="92" />
61 <button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;" 61 <button name="toggle_active_speakers_btn"
62 label_selected="&gt; &gt;" left="143" name="toggle_active_speakers_btn" 62 label="&lt;&lt;" label_selected="&gt;&gt;" follows="right|top"
63 right="176" 63 bottom_delta="0" left="133" right="176" height="20"
64 tool_tip="Click here to toggle a list of active participants in this IM session." 64 tool_tip="Toggle list of active participants in this IM session." />
65 visible="true" width="30" />
66 <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" 65 <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
67 bottom="30" embedded_items="false" enabled="false" 66 bottom="30" embedded_items="false" enabled="false"
68 follows="left|top|right|bottom" font="SansSerif" left="4" 67 follows="left|top|right|bottom" font="SansSerif" left="4"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_preview_gesture.xml b/linden/indra/newview/skins/default/xui/en-us/floater_preview_gesture.xml
index 25121ff..09fe2c0 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_preview_gesture.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_preview_gesture.xml
@@ -57,13 +57,13 @@ Chat
57Wait 57Wait
58 </scroll_list> 58 </scroll_list>
59 <button bottom_delta="90" follows="top|left" height="20" label="Add &gt;&gt;" 59 <button bottom_delta="90" follows="top|left" height="20" label="Add &gt;&gt;"
60 left="130" name="add_btn" width="80" /> 60 left="125" name="add_btn" width="90" />
61 <button bottom_delta="-30" follows="top|left" height="20" label="Move Up" 61 <button bottom_delta="-30" follows="top|left" height="20" label="Move Up"
62 left_delta="0" name="up_btn" width="80" /> 62 left_delta="0" name="up_btn" width="90" />
63 <button bottom_delta="-30" follows="top|left" height="20" label="Move Down" 63 <button bottom_delta="-30" follows="top|left" height="20" label="Move Down"
64 left_delta="0" name="down_btn" width="80" /> 64 left_delta="0" name="down_btn" width="90" />
65 <button bottom_delta="-30" follows="top|left" height="20" label="Remove" left_delta="0" 65 <button bottom_delta="-30" follows="top|left" height="20" label="Remove" left_delta="0"
66 name="delete_btn" width="80" /> 66 name="delete_btn" width="90" />
67 <scroll_list bottom_delta="0" draw_border="true" follows="top|left" height="110" left="220" 67 <scroll_list bottom_delta="0" draw_border="true" follows="top|left" height="110" left="220"
68 multi_select="false" name="step_list" width="210" /> 68 multi_select="false" name="step_list" width="210" />
69 <text bottom_delta="-70" follows="top|left" font="SansSerif" height="60" left="16" 69 <text bottom_delta="-70" follows="top|left" font="SansSerif" height="60" left="16"
diff --git a/linden/indra/newview/skins/default/xui/en-us/fonts.xml b/linden/indra/newview/skins/default/xui/en-us/fonts.xml
index a450bb6..95070ed 100644
--- a/linden/indra/newview/skins/default/xui/en-us/fonts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/fonts.xml
@@ -10,8 +10,8 @@
10 <file>ArialUni.ttf</file> 10 <file>ArialUni.ttf</file>
11 </os> 11 </os>
12 <os name="Mac"> 12 <os name="Mac">
13 <file>ヒラギノ角ゴ Pro W3.otf</file> 13 <file>ヒラギノ角ゴ Pro W3.otf</file>
14 <file>ヒラギノ角ゴ ProN W3.otf</file> 14 <file>ヒラギノ角ゴ ProN W3.otf</file>
15 <file>AppleGothic.dfont</file> 15 <file>AppleGothic.dfont</file>
16 <file>AppleGothic.ttf</file> 16 <file>AppleGothic.ttf</file>
17 <file>åŽæ–‡ç»†é»‘.ttf</file> 17 <file>åŽæ–‡ç»†é»‘.ttf</file>
@@ -19,13 +19,13 @@
19 </font> 19 </font>
20 20
21 <font name="SansSerif" comment="Name of san-serif font (Truetype file name)"> 21 <font name="SansSerif" comment="Name of san-serif font (Truetype file name)">
22 <file>LiberationSans-Regular.ttf</file> 22 <file>DejaVuSansCondensed.ttf</file>
23 </font> 23 </font>
24 24
25 <font name="SansSerifBold" 25 <font name="SansSerifBold"
26 comment="Name of bold sans-serif font" 26 comment="Name of bold sans-serif font"
27 font_style="Bold"> 27 font_style="Bold">
28 <file>LiberationSans-Bold.ttf</file> 28 <file>DejaVuSansCondensed-Bold.ttf</file>
29 </font> 29 </font>
30 30
31 <font name="Monospace" 31 <font name="Monospace"
@@ -35,25 +35,25 @@
35 35
36 <font name="DejaVu" 36 <font name="DejaVu"
37 comment="Name of DejaVu font"> 37 comment="Name of DejaVu font">
38 <file>DejaVuSans.ttf</file> 38 <file>DejaVuSansCondensed.ttf</file>
39 </font> 39 </font>
40 40
41 <font name="DejaVu" 41 <font name="DejaVu"
42 comment="Name of DejaVu font (bold)" 42 comment="Name of DejaVu font (bold)"
43 font_style="BOLD"> 43 font_style="BOLD">
44 <file>DejaVuSansBold.ttf</file> 44 <file>DejaVuSansCondensed-Bold.ttf</file>
45 </font> 45 </font>
46 46
47 <font name="DejaVu" 47 <font name="DejaVu"
48 comment="Name of DejaVu font (italic)" 48 comment="Name of DejaVu font (italic)"
49 font_style="ITALIC"> 49 font_style="ITALIC">
50 <file>DejaVuSansOblique.ttf</file> 50 <file>DejaVuSansCondensed-Oblique.ttf</file>
51 </font> 51 </font>
52 52
53 <font name="DejaVu" 53 <font name="DejaVu"
54 comment="Name of DejaVu font (bold italic)" 54 comment="Name of DejaVu font (bold italic)"
55 font_style="BOLD|ITALIC"> 55 font_style="BOLD|ITALIC">
56 <file>DejaVuSansBoldOblique.ttf</file> 56 <file>DejaVuSansCondensed-BoldOblique.ttf</file>
57 </font> 57 </font>
58 58
59 <font name="Helvetica" 59 <font name="Helvetica"
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 1b64878..d15657e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -815,12 +815,12 @@
815 <menu_item_call name="Imprudence Blog" 815 <menu_item_call name="Imprudence Blog"
816 label="Imprudence Blog"> 816 label="Imprudence Blog">
817 <on_click function="PromptShowURL" 817 <on_click function="PromptShowURL"
818 userdata="WebLaunchImprudenceBlog,http://www.imprudenceviewer.org/" /> 818 userdata="WebLaunchImprudenceBlog,http://imprudenceviewer.org/" />
819 </menu_item_call> 819 </menu_item_call>
820 <menu_item_call name="Imprudence Forums" 820 <menu_item_call name="Imprudence Forums"
821 label="Imprudence Forums"> 821 label="Imprudence Forums">
822 <on_click function="PromptShowURL" 822 <on_click function="PromptShowURL"
823 userdata="WebLaunchImprudenceForums,http://www.imprudenceviewer.org/forums/" /> 823 userdata="WebLaunchImprudenceForums,http://imprudenceviewer.org/forums/" />
824 </menu_item_call> 824 </menu_item_call>
825 <menu_item_separator /> 825 <menu_item_separator />
826 <menu_item_call name="Scripting Portal" 826 <menu_item_call name="Scripting Portal"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
index 83facb4..46283bb 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
@@ -68,8 +68,8 @@
68 v_pad="0" width="128"> 68 v_pad="0" width="128">
69 World search: 69 World search:
70 </text> 70 </text>
71 <line_editor bottom_delta="-8" enabled="true" follows="left|top" font="SansSerif" 71 <line_editor bottom_delta="-8" enabled="true" follows="left|top"
72 height="18" left="100" name="world_search_editor" 72 font="SansSerifSmall" height="18" left="100" name="world_search_editor"
73 tool_tip="Address of the world search engine you would like to use" 73 tool_tip="Address of the world search engine you would like to use"
74 width="355" /> 74 width="355" />
75 <button bottom_delta="-22" enabled="true" follows="left|top" font="SansSerif" 75 <button bottom_delta="-22" enabled="true" follows="left|top" font="SansSerif"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_toolbar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_toolbar.xml
index 9c57be0..7a82674 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_toolbar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_toolbar.xml
@@ -16,7 +16,7 @@
16 <flyout_button bottom="0" font="SansSerif" height="24" label="Communicate" left="0" 16 <flyout_button bottom="0" font="SansSerif" height="24" label="Communicate" left="0"
17 name="communicate_btn" tool_tip="Communicate with your Friends and Groups." 17 name="communicate_btn" tool_tip="Communicate with your Friends and Groups."
18 list_position="above" 18 list_position="above"
19 width="50" follows="left|right" user_resize="false"/> 19 width="60" follows="left|right" user_resize="false"/>
20 <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0"/> 20 <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0"/>
21 <button bottom="0" font="SansSerif" height="24" label="Fly" 21 <button bottom="0" font="SansSerif" height="24" label="Fly"
22 image_overlay="icn_toolbar_fly.tga" image_overlay_alignment="left" 22 image_overlay="icn_toolbar_fly.tga" image_overlay_alignment="left"
@@ -25,7 +25,7 @@
25 image_disabled="toolbar_btn_disabled.tga" scale_image="true" 25 image_disabled="toolbar_btn_disabled.tga" scale_image="true"
26 label_selected="Stop Flying" left="0" name="fly_btn" 26 label_selected="Stop Flying" left="0" name="fly_btn"
27 tool_tip="Start flying. Use E/C or PgUp/PgDn to fly up and down." 27 tool_tip="Start flying. Use E/C or PgUp/PgDn to fly up and down."
28 width="50" follows="left|right" user_resize="false"/> 28 width="40" follows="left|right" user_resize="false"/>
29 <button bottom="0" font="SansSerif" height="24" label="Snapshot" left="0" 29 <button bottom="0" font="SansSerif" height="24" label="Snapshot" left="0"
30 image_overlay="icn_toolbar_snapshot.tga" image_overlay_alignment="left" 30 image_overlay="icn_toolbar_snapshot.tga" image_overlay_alignment="left"
31 image_selected="toolbar_btn_selected.tga" 31 image_selected="toolbar_btn_selected.tga"
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 88ef0ad..15172f2 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -78,6 +78,10 @@ class ViewerManifest(LLManifest):
78 self.path("LiberationSans-Bold.ttf") 78 self.path("LiberationSans-Bold.ttf")
79 self.path("LiberationSans-Regular.ttf") 79 self.path("LiberationSans-Regular.ttf")
80 self.path("VeraMono.ttf") 80 self.path("VeraMono.ttf")
81 self.path("DejaVuSansCondensed-BoldOblique.ttf")
82 self.path("DejaVuSansCondensed-Bold.ttf")
83 self.path("DejaVuSansCondensed-Oblique.ttf")
84 self.path("DejaVuSansCondensed.ttf")
81 self.path("GPL.txt") 85 self.path("GPL.txt")
82 self.path("Liberation-License.txt") 86 self.path("Liberation-License.txt")
83 self.path("Vera-License.txt") 87 self.path("Vera-License.txt")
@@ -1006,7 +1010,6 @@ class Linux_i686Manifest(LinuxManifest):
1006 self.path("libvivoxsdk.so") 1010 self.path("libvivoxsdk.so")
1007 self.end_prefix("lib") 1011 self.end_prefix("lib")
1008 1012
1009
1010class Linux_x86_64Manifest(LinuxManifest): 1013class Linux_x86_64Manifest(LinuxManifest):
1011 def construct(self): 1014 def construct(self):
1012 super(Linux_x86_64Manifest, self).construct() 1015 super(Linux_x86_64Manifest, self).construct()
@@ -1123,14 +1126,6 @@ class Linux_x86_64Manifest(LinuxManifest):
1123 self.end_prefix("gstreamer-plugins") 1126 self.end_prefix("gstreamer-plugins")
1124 self.end_prefix("lib64") 1127 self.end_prefix("lib64")
1125 1128
1126# if self.prefix("../../libraries/x86_64-linux/lib_release_client/32bit-compat", dst="lib32"):
1127# self.path("libalut.so")
1128# self.path("libidn.so.11")
1129# self.path("libopenal.so.1")
1130# self.path("libortp.so")
1131# self.path("libuuid.so.1")
1132# self.end_prefix("lib32")
1133
1134 1129
1135 # Vivox runtimes and libs 1130 # Vivox runtimes and libs
1136 if self.prefix(src="vivox-runtime/i686-linux", dst="bin"): 1131 if self.prefix(src="vivox-runtime/i686-linux", dst="bin"):
@@ -1138,10 +1133,19 @@ class Linux_x86_64Manifest(LinuxManifest):
1138 self.end_prefix("bin") 1133 self.end_prefix("bin")
1139 1134
1140 if self.prefix(src="vivox-runtime/i686-linux", dst="lib32"): 1135 if self.prefix(src="vivox-runtime/i686-linux", dst="lib32"):
1141 self.path("libalut.so") 1136 #self.path("libalut.so")
1142 self.path("libortp.so") 1137 self.path("libortp.so")
1143 self.path("libvivoxsdk.so") 1138 self.path("libvivoxsdk.so")
1144 self.end_prefix("lib32") 1139 self.end_prefix("lib32")
1140
1141 # 32bit libs needed for voice
1142 if self.prefix("../../libraries/x86_64-linux/lib_release_client/32bit-compat", dst="lib32"):
1143 self.path("libalut.so")
1144 self.path("libidn.so.11")
1145 self.path("libopenal.so.1")
1146 # self.path("libortp.so")
1147 self.path("libuuid.so.1")
1148 self.end_prefix("lib32")
1145 1149
1146if __name__ == "__main__": 1150if __name__ == "__main__":
1147 main() 1151 main()
diff --git a/linden/install.xml b/linden/install.xml
index 221f788..88979d6 100755
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -476,6 +476,46 @@
476 </map> 476 </map>
477 </map> 477 </map>
478 </map> 478 </map>
479 <key>fonts</key>
480 <map>
481 <key>description</key>
482 <string>Fonts used by the viewer.</string>
483 <key>copyright</key>
484 <string>Various (see contents)</string>
485 <key>license</key>
486 <string>multiple</string>
487 <key>packages</key>
488 <map>
489 <key>darwin</key>
490 <map>
491 <key>md5sum</key>
492 <string>e613a485c3f15009b24accb84ad790a4</string>
493 <key>url</key>
494 <uri>http://imprudenceviewer.org/download/extras/imprudence-fonts-20100830.tar.bz2</uri>
495 </map>
496 <key>linux</key>
497 <map>
498 <key>md5sum</key>
499 <string>e613a485c3f15009b24accb84ad790a4</string>
500 <key>url</key>
501 <uri>http://imprudenceviewer.org/download/extras/imprudence-fonts-20100830.tar.bz2</uri>
502 </map>
503 <key>linux64</key>
504 <map>
505 <key>md5sum</key>
506 <string>e613a485c3f15009b24accb84ad790a4</string>
507 <key>url</key>
508 <uri>http://imprudenceviewer.org/download/extras/imprudence-fonts-20100830.tar.bz2</uri>
509 </map>
510 <key>windows</key>
511 <map>
512 <key>md5sum</key>
513 <string>e613a485c3f15009b24accb84ad790a4</string>
514 <key>url</key>
515 <uri>http://imprudenceviewer.org/download/extras/imprudence-fonts-20100830.tar.bz2</uri>
516 </map>
517 </map>
518 </map>
479 <key>freetype</key> 519 <key>freetype</key>
480 <map> 520 <map>
481 <key>copyright</key> 521 <key>copyright</key>
@@ -1554,6 +1594,29 @@ Copyright (C) 2004-2005 Vladimir Berezniker @ http://public.xdi.org/=vmpn
1554 </map> 1594 </map>
1555 </map> 1595 </map>
1556 </map> 1596 </map>
1597 <key>32bitcompatibilitylibs</key>
1598 <map>
1599 <key>copyright</key>
1600 <string>Copyrights: Libidn: Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
1601 Simon Josefsson. License GPL v3.0.
1602 Freealut, libuuid, openal-soft: see copyright and license of the
1603 according main packages.
1604 </string>
1605 <key>description</key>
1606 <string>32bit libraries needed for using voice</string>
1607 <key>license</key>
1608 <string>gpl</string>
1609 <key>packages</key>
1610 <map>
1611 <key>linux64</key>
1612 <map>
1613 <key>md5sum</key>
1614 <string>cbaafc55fb8b14283541791e82f13462</string>
1615 <key>url</key>
1616 <uri>http://imprudenceviewer.org/download/libs/linux64-32bitcompatibilitylibs-20100903.tar.bz2</uri>
1617 </map>
1618 </map>
1619 </map>
1557 <key>xmlrpc-epi</key> 1620 <key>xmlrpc-epi</key>
1558 <map> 1621 <map>
1559 <key>copyright</key> 1622 <key>copyright</key>
@@ -1917,6 +1980,11 @@ Cass Everitt - cass@r3.nu
1917 <key>text</key> 1980 <key>text</key>
1918 <string>http://www.jclark.com/xml/copying.txt</string> 1981 <string>http://www.jclark.com/xml/copying.txt</string>
1919 </map> 1982 </map>
1983 <key>multiple</key>
1984 <map>
1985 <key>text</key>
1986 <string>Multiple licenses. See package contents for details.</string>
1987 </map>
1920 <key>mozillaPL</key> 1988 <key>mozillaPL</key>
1921 <map> 1989 <map>
1922 <key>url</key> 1990 <key>url</key>
generated by cgit v1.1 at 2024-11-15 23:25:30 +0000