aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview')
-rw-r--r--linden/indra/newview/llappviewermacosx.cpp2
-rw-r--r--linden/indra/newview/llmediactrl.cpp2
-rw-r--r--linden/indra/newview/llviewertexteditor.h2
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_about.xml2
4 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/llappviewermacosx.cpp b/linden/indra/newview/llappviewermacosx.cpp
index d81b6e3..5496e5b 100644
--- a/linden/indra/newview/llappviewermacosx.cpp
+++ b/linden/indra/newview/llappviewermacosx.cpp
@@ -300,7 +300,7 @@ static OSStatus CarbonEventHandler(EventHandlerCallRef inHandlerCallRef,
300void LLAppViewerMacOSX::handleCrashReporting(bool reportFreeze) 300void LLAppViewerMacOSX::handleCrashReporting(bool reportFreeze)
301{ 301{
302 // This used to use fork&exec, but is switched to LSOpenApplication to 302 // This used to use fork&exec, but is switched to LSOpenApplication to
303 // Make sure the crash reporter launches in front of the SL window. 303 // Make sure the crash reporter launches in front of the viewer window.
304 304
305 std::string command_str; 305 std::string command_str;
306 //command_str = "open Second Life.app/Contents/Resources/mac-crash-logger.app"; 306 //command_str = "open Second Life.app/Contents/Resources/mac-crash-logger.app";
diff --git a/linden/indra/newview/llmediactrl.cpp b/linden/indra/newview/llmediactrl.cpp
index cc9fec6..51b0929 100644
--- a/linden/indra/newview/llmediactrl.cpp
+++ b/linden/indra/newview/llmediactrl.cpp
@@ -888,7 +888,7 @@ void LLMediaCtrl::onClickLinkHref( LLPluginClassMedia* self )
888// const bool open_links_externally = false; 888// const bool open_links_externally = false;
889// LLFloaterHtml::getInstance()->show( 889// LLFloaterHtml::getInstance()->show(
890// event_in.mStringPayload, 890// event_in.mStringPayload,
891// "Second Life Browser", 891// "Viewer Browser",
892// open_links_externally, 892// open_links_externally,
893// mTrusted); 893// mTrusted);
894 } 894 }
diff --git a/linden/indra/newview/llviewertexteditor.h b/linden/indra/newview/llviewertexteditor.h
index c69b3f0..9d30e4f 100644
--- a/linden/indra/newview/llviewertexteditor.h
+++ b/linden/indra/newview/llviewertexteditor.h
@@ -85,7 +85,7 @@ public:
85 void setEmbeddedText(const std::string& instr); 85 void setEmbeddedText(const std::string& instr);
86 std::string getEmbeddedText(); 86 std::string getEmbeddedText();
87 87
88 // Appends Second Life time, small font, grey. 88 // Appends grid time, small font, grey.
89 // If this starts a line, you need to prepend a newline. 89 // If this starts a line, you need to prepend a newline.
90 std::string appendTime(bool prepend_newline); 90 std::string appendTime(bool prepend_newline);
91 91
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 ef02bfa..3485684 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
@@ -2,7 +2,7 @@
2<floater can_close="true" can_drag_on_left="false" can_minimize="true" 2<floater can_close="true" can_drag_on_left="false" can_minimize="true"
3 can_resize="false" height="440" min_height="100" min_width="100" 3 can_resize="false" height="440" min_height="100" min_width="100"
4 name="floater_about" rect_control="FloaterAboutRect" 4 name="floater_about" rect_control="FloaterAboutRect"
5 title="About Second Life" width="470"> 5 title="About grid viewer" width="470">
6 <text_editor bottom="-434" embedded_items="false" 6 <text_editor bottom="-434" embedded_items="false"
7 follows="left|top|right|bottom" font="SansSerifSmall" height="168" left="6" 7 follows="left|top|right|bottom" font="SansSerifSmall" height="168" left="6"
8 max_length="65536" mouse_opaque="true" name="credits_editor" width="458" 8 max_length="65536" mouse_opaque="true" name="credits_editor" width="458"