diff options
-rw-r--r-- | linden/indra/newview/lldrawpoolbump.cpp | 2 | ||||
-rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/linden/indra/newview/lldrawpoolbump.cpp b/linden/indra/newview/lldrawpoolbump.cpp index 0dd11d6..73d88f7 100644 --- a/linden/indra/newview/lldrawpoolbump.cpp +++ b/linden/indra/newview/lldrawpoolbump.cpp | |||
@@ -139,7 +139,7 @@ void LLStandardBumpmap::restoreGL() | |||
139 | return; | 139 | return; |
140 | } | 140 | } |
141 | 141 | ||
142 | // llinfos << "Loading bumpmap: " << bump_file << " from viewerart" << llendl; | 142 | llinfos << "Loading bumpmap: " << bump_file << " from viewerart" << llendl; |
143 | gStandardBumpmapList[LLStandardBumpmap::sStandardBumpmapCount].mLabel = label; | 143 | gStandardBumpmapList[LLStandardBumpmap::sStandardBumpmapCount].mLabel = label; |
144 | gStandardBumpmapList[LLStandardBumpmap::sStandardBumpmapCount].mImage = | 144 | gStandardBumpmapList[LLStandardBumpmap::sStandardBumpmapCount].mImage = |
145 | gImageList.getImageFromFile(bump_file, | 145 | gImageList.getImageFromFile(bump_file, |
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 f82f254..52cad9e 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 | |||
@@ -764,7 +764,7 @@ | |||
764 | 764 | ||
765 | <menu name="Help" create_jump_keys="true" label="Help" | 765 | <menu name="Help" create_jump_keys="true" label="Help" |
766 | opaque="true" tear_off="true"> | 766 | opaque="true" tear_off="true"> |
767 | <menu_item_call name="Second Life Help" label="Second Life Help" | 767 | <menu_item_call name="Second Life Help" label="Help" |
768 | shortcut="F1"> | 768 | shortcut="F1"> |
769 | <on_click function="ShowFloater" userdata="help f1" /> | 769 | <on_click function="ShowFloater" userdata="help f1" /> |
770 | </menu_item_call> | 770 | </menu_item_call> |
@@ -773,9 +773,9 @@ | |||
773 | </menu_item_call> | 773 | </menu_item_call> |
774 | <menu_item_separator /> | 774 | <menu_item_separator /> |
775 | <menu_item_call name="Official Linden Blog..." | 775 | <menu_item_call name="Official Linden Blog..." |
776 | label="Official Linden Blog..."> | 776 | label="Imprudence Blog..."> |
777 | <on_click function="PromptShowURL" | 777 | <on_click function="PromptShowURL" |
778 | userdata="WebLaunchSupportWiki,http://blog.secondlife.com/" /> | 778 | userdata="WebLaunchSupportWiki,http://www.imprudence.com/" /> |
779 | </menu_item_call> | 779 | </menu_item_call> |
780 | <menu_item_separator /> | 780 | <menu_item_separator /> |
781 | <menu_item_call name="Scripting Guide..." | 781 | <menu_item_call name="Scripting Guide..." |
@@ -836,7 +836,7 @@ | |||
836 | </menu> | 836 | </menu> |
837 | <menu_item_separator /> | 837 | <menu_item_separator /> |
838 | <menu_item_call name="About Second Life..." | 838 | <menu_item_call name="About Second Life..." |
839 | label="About Second Life..."> | 839 | label="About Imprudence..."> |
840 | <on_click function="ShowFloater" userdata="about" /> | 840 | <on_click function="ShowFloater" userdata="about" /> |
841 | </menu_item_call> | 841 | </menu_item_call> |
842 | </menu> | 842 | </menu> |