Branding updaters & Crashloggers. These aren't used, but better to do it now.
Arrehn
parent
c3f6adb550
commit
15c8a8cc0a
|
|
@ -30,7 +30,7 @@
|
|||
const S32 LL_VERSION_MAJOR = 2;
|
||||
const S32 LL_VERSION_MINOR = 4;
|
||||
const S32 LL_VERSION_PATCH = 0;
|
||||
const S32 LL_VERSION_BUILD = 13828;
|
||||
const S32 LL_VERSION_BUILD = 13832;
|
||||
|
||||
const char * const LL_CHANNEL = "Firestorm-private-Romana.local";
|
||||
|
||||
|
|
|
|||
|
|
@ -67,17 +67,18 @@ BOOL check_for_card(const char* RENDERER, const char* bad_card)
|
|||
if (!strnicmp(RENDERER, bad_card, strlen(bad_card)))
|
||||
{
|
||||
std::string buffer = llformat(
|
||||
"Your video card appears to be a %s, which Second Life does not support.\n"
|
||||
"Your video card appears to be a %s, which Firestorm does not support.\n"
|
||||
"\n"
|
||||
"Second Life requires a video card with 32 Mb of memory or more, as well as\n"
|
||||
"Firestorm requires a video card with 32 Mb of memory or more, as well as\n"
|
||||
"multitexture support. We explicitly support nVidia GeForce 2 or better, \n"
|
||||
"and ATI Radeon 8500 or better.\n"
|
||||
"\n"
|
||||
"If you own a supported card and continue to receive this message, try \n"
|
||||
"updating to the latest video card drivers. Otherwise look in the\n"
|
||||
"secondlife.com support section or e-mail technical support\n"
|
||||
"updating to the latest video card drivers. Otherwise contact the\n"
|
||||
"Phoenix Viewer Support group in world, or visit www.phoenixviewer.com\n"
|
||||
"for support.\n"
|
||||
"\n"
|
||||
"You can try to run Second Life, but it will probably crash or run\n"
|
||||
"You can try to run Firestorm, but it will probably crash or run\n"
|
||||
"very slowly. Try anyway?",
|
||||
bad_card);
|
||||
S32 button = OSMessageBox(buffer.c_str(), "Unsupported video card", OSMB_YESNO);
|
||||
|
|
|
|||
|
|
@ -1292,7 +1292,7 @@ void test_cached_control()
|
|||
TEST_LLCC(LLColor4U, LLColor4U(255, 200, 100, 255));
|
||||
//There's no LLSD comparsion for LLCC yet. TEST_LLCC(LLSD, test_llsd);
|
||||
|
||||
if((std::string)test_BrowserHomePage != "http://www.secondlife.com") llerrs << "Fail BrowserHomePage" << llendl;
|
||||
if((std::string)test_BrowserHomePage != "http://www.phoenixviewer.com") llerrs << "Fail BrowserHomePage" << llendl;
|
||||
}
|
||||
#endif // TEST_CACHED_CONTROL
|
||||
|
||||
|
|
|
|||
|
|
@ -3,15 +3,17 @@
|
|||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>IBFramework Version</key>
|
||||
<string>629</string>
|
||||
<string>788</string>
|
||||
<key>IBLastKnownRelativeProjectPath</key>
|
||||
<string>../../build-darwin-i386/SecondLife.xcodeproj</string>
|
||||
<key>IBOldestOS</key>
|
||||
<integer>5</integer>
|
||||
<key>IBOpenObjects</key>
|
||||
<array/>
|
||||
<array>
|
||||
<integer>181</integer>
|
||||
</array>
|
||||
<key>IBSystem Version</key>
|
||||
<string>9E17</string>
|
||||
<string>10H574</string>
|
||||
<key>targetFramework</key>
|
||||
<string>IBCarbonFramework</string>
|
||||
</dict>
|
||||
|
|
|
|||
|
|
@ -3,10 +3,14 @@
|
|||
<object name="rootObject" class="NSCustomObject" id="1">
|
||||
</object>
|
||||
<array count="7" name="allObjects">
|
||||
<object class="IBCarbonButton" id="182">
|
||||
<ostype name="command">ok </ostype>
|
||||
<string name="title">Send Report</string>
|
||||
<string name="bounds">414 273 434 378 </string>
|
||||
<object class="IBCarbonStaticText" id="181">
|
||||
<string name="title">Firestorm appears to have crashed or frozen the last time it ran. This crash reporter collects information about your computer's hardware configuration, operating system, and some Firestorm logs, all of which are used for debugging purposes only. In the space below, please briefly describe what you were doing or trying to do just prior to the crash. Thank you for your help! If you have additional information you would like to report, please enter a ticket at: http://www.phoenixviewer.com/support/ If you don't wish to send a crash report, press Cancel. This crash reporter collects information about your computer's hardware configuration, operating system, and some Second Life logs, all of which are used for debugging purposes only. In the space below, please briefly describe what you were doing or trying to do just prior to the crash. Thank you for your help! This report is NOT read by Customer Support. If you have billing or other questions, please go to: http://www.secondlife.com/support/ If you don't wish to send Linden Lab a crash report, press Cancel. </string>
|
||||
<string name="bounds">20 20 231 487 </string>
|
||||
</object>
|
||||
<object class="IBCarbonEditText" id="185">
|
||||
<ostype name="controlSignature">text</ostype>
|
||||
<boolean name="isUnicode">TRUE</boolean>
|
||||
<string name="bounds">242 23 391 484 </string>
|
||||
</object>
|
||||
<object class="IBCarbonButton" id="183">
|
||||
<ostype name="command">not!</ostype>
|
||||
|
|
@ -14,25 +18,21 @@
|
|||
<string name="title">Don't Send</string>
|
||||
<string name="bounds">414 390 434 487 </string>
|
||||
</object>
|
||||
<object class="IBCarbonStaticText" id="181">
|
||||
<string name="title">Second Life appears to have crashed or frozen the last time it ran. This crash reporter collects information about your computer's hardware configuration, operating system, and some Second Life logs, all of which are used for debugging purposes only. In the space below, please briefly describe what you were doing or trying to do just prior to the crash. Thank you for your help! This report is NOT read by Customer Support. If you have billing or other questions, please go to: http://www.secondlife.com/support/ If you don't wish to send Linden Lab a crash report, press Cancel. </string>
|
||||
<string name="bounds">20 20 231 487 </string>
|
||||
</object>
|
||||
<object class="IBCarbonWindow" id="166">
|
||||
<int name="carbonWindowClass">2</int>
|
||||
<int name="themeBrush">3</int>
|
||||
<int name="windowPosition">7</int>
|
||||
<string name="title">Second Life Crash Logger</string>
|
||||
<string name="title">Firestorm Crash Logger</string>
|
||||
<object name="rootControl" class="IBCarbonRootControl" id="167">
|
||||
<array count="5" name="subviews">
|
||||
<reference idRef="181"/>
|
||||
<reference idRef="182"/>
|
||||
<reference idRef="183"/>
|
||||
<object class="IBCarbonEditText" id="185">
|
||||
<ostype name="controlSignature">text</ostype>
|
||||
<boolean name="isUnicode">TRUE</boolean>
|
||||
<string name="bounds">242 23 391 484 </string>
|
||||
<object class="IBCarbonButton" id="182">
|
||||
<ostype name="command">ok </ostype>
|
||||
<string name="title">Send Report</string>
|
||||
<string name="bounds">414 273 434 378 </string>
|
||||
</object>
|
||||
<reference idRef="183"/>
|
||||
<reference idRef="185"/>
|
||||
<object class="IBCarbonCheckBox" id="193">
|
||||
<ostype name="controlSignature">remb</ostype>
|
||||
<string name="title">Remember This Choice</string>
|
||||
|
|
@ -44,9 +44,9 @@
|
|||
<string name="windowRect">257 653 711 1160 </string>
|
||||
<string name="ScreenRectAtEncodeTime">0 0 768 1024 </string>
|
||||
</object>
|
||||
<reference idRef="185"/>
|
||||
<reference idRef="167"/>
|
||||
<reference idRef="193"/>
|
||||
<reference idRef="167"/>
|
||||
<reference idRef="182"/>
|
||||
</array>
|
||||
<array count="7" name="allParents">
|
||||
<reference idRef="167"/>
|
||||
|
|
|
|||
|
|
@ -337,7 +337,7 @@ int parse_args(int argc, char **argv)
|
|||
int main(int argc, char **argv)
|
||||
{
|
||||
// We assume that all the logs we're looking for reside on the current drive
|
||||
gDirUtilp->initAppDirs("SecondLife");
|
||||
gDirUtilp->initAppDirs("Firestorm");
|
||||
|
||||
LLError::initForApplication( gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, ""));
|
||||
|
||||
|
|
@ -370,7 +370,7 @@ int main(int argc, char **argv)
|
|||
}
|
||||
else
|
||||
{
|
||||
gProductName = "Second Life";
|
||||
gProductName = "Firestorm";
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -463,7 +463,7 @@ int main(int argc, char **argv)
|
|||
err = CreateStandardAlert(
|
||||
kAlertStopAlert,
|
||||
CFSTR("Error"),
|
||||
CFSTR("An error occurred while updating Second Life. Please download the latest version from www.secondlife.com."),
|
||||
CFSTR("An error occurred while updating Firestorm. Please download the latest version from www.phoenixviewer.com."),
|
||||
¶ms,
|
||||
&alert);
|
||||
|
||||
|
|
@ -905,7 +905,7 @@ void *updatethreadproc(void*)
|
|||
|
||||
#endif // 0 *HACK for DEV-11935
|
||||
|
||||
strncat(temp, "/SecondLifeUpdate_XXXXXX", (sizeof(temp) - strlen(temp)) - 1);
|
||||
strncat(temp, "/FirestormUpdate_XXXXXX", (sizeof(temp) - strlen(temp)) - 1);
|
||||
if(mkdtemp(temp) == NULL)
|
||||
{
|
||||
throw 0;
|
||||
|
|
@ -923,7 +923,7 @@ void *updatethreadproc(void*)
|
|||
|
||||
chdir(tempDir);
|
||||
|
||||
snprintf(temp, sizeof(temp), "SecondLife.dmg");
|
||||
snprintf(temp, sizeof(temp), "Firestorm.dmg");
|
||||
|
||||
downloadFile = LLFile::fopen(temp, "wb"); /* Flawfinder: ignore */
|
||||
if(downloadFile == NULL)
|
||||
|
|
@ -970,7 +970,7 @@ void *updatethreadproc(void*)
|
|||
// NOTE: we could add -private at the end of this command line to keep the image from showing up in the Finder,
|
||||
// but if our cleanup fails, this makes it much harder for the user to unmount the image.
|
||||
std::string mountOutput;
|
||||
FILE* mounter = popen("hdiutil attach SecondLife.dmg -mountpoint mnt", "r"); /* Flawfinder: ignore */
|
||||
FILE* mounter = popen("hdiutil attach Firestorm.dmg -mountpoint mnt", "r"); /* Flawfinder: ignore */
|
||||
|
||||
if(mounter == NULL)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -515,8 +515,8 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
|
|||
(gchar*)"private-slvideoplugin",
|
||||
(gchar*)"SL Video sink plugin",
|
||||
plugin_init, (gchar*)"1.0", (gchar*)"LGPL",
|
||||
(gchar*)"Second Life",
|
||||
(gchar*)"http://www.secondlife.com/");
|
||||
(gchar*)"Firestorm",
|
||||
(gchar*)"http://www.phoenixviewer.com/");
|
||||
#undef PACKAGE
|
||||
void gst_slvideo_init_class (void)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -385,7 +385,7 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nSho
|
|||
//EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &dev_mode);
|
||||
|
||||
gWindow = CreateWindowEx(NULL, win_class_name,
|
||||
L"Second Life Updater",
|
||||
L"Firestorm Updater",
|
||||
WS_OVERLAPPEDWINDOW,
|
||||
CW_USEDEFAULT,
|
||||
CW_USEDEFAULT,
|
||||
|
|
@ -421,7 +421,7 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nSho
|
|||
return 1;
|
||||
}
|
||||
std::string update_exec_path(temp_path);
|
||||
update_exec_path.append("Second_Life_Updater.exe");
|
||||
update_exec_path.append("Firestorm_Updater.exe");
|
||||
|
||||
WCHAR update_uri[4096];
|
||||
mbstowcs(update_uri, gUpdateURL, sizeof(update_uri));
|
||||
|
|
@ -448,11 +448,11 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nSho
|
|||
if (gTotalBytesRead < (1024 * 1024) && ! cancelled)
|
||||
{
|
||||
MessageBox(gWindow,
|
||||
L"The Second Life auto-update has failed.\n"
|
||||
L"The Firestorm auto-update has failed.\n"
|
||||
L"The problem may be caused by other software installed \n"
|
||||
L"on your computer, such as a firewall.\n"
|
||||
L"Please visit http://secondlife.com/download/ \n"
|
||||
L"to download the latest version of Second Life.\n",
|
||||
L"Please visit http://www.phoenixviewer.com/ \n"
|
||||
L"to download the latest version of Firestorm.\n",
|
||||
NULL, MB_OK);
|
||||
return 1;
|
||||
}
|
||||
|
|
@ -466,7 +466,7 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nSho
|
|||
if (!success)
|
||||
{
|
||||
MessageBox(gWindow,
|
||||
L"Second Life download failed.\n"
|
||||
L"Firestorm download failed.\n"
|
||||
L"Please try again later.",
|
||||
NULL, MB_OK);
|
||||
return 1;
|
||||
|
|
|
|||
Loading…
Reference in New Issue