The following commit has been merged in the master branch:
commit d5f4bd76a5f52aa76548fa3bf80e649cd0240cf9
Merge: 86b70162823912e9768bbc5579ccd9743002a975
a23d494f59180e6bc067665d1768d93611a7f528
Author: Robin Cornelius <[EMAIL PROTECTED]>
Date: Thu May 29 12:36:32 2008 +0100
Merge branch 'upstream'
diff --combined indra/newview/llstartup.cpp
index 82ed8b3,4dca600..864e7f9
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@@ -645,9 -645,6 +645,9 @@@ BOOL idle_startup(
LLViewerMedia::initClass();
LLViewerParcelMedia::initClass();
+ if (gAudiop)
+ gAudiop->InitStreamer();
+
if (gViewerWindow)
{
audio_update_volume(true);
@@@ -1227,7 -1224,7 +1227,7 @@@
sAuthUriNum++;
std::ostringstream s;
LLString::format_map_t args;
- args["[NUMBER]"] = sAuthUriNum + 1;
+ args["[NUMBER]"] = llformat("%d", sAuthUriNum +
1);
auth_desc = LLTrans::getString("LoginAttempt",
args).c_str();
LLStartUp::setStartupState(
STATE_LOGIN_AUTHENTICATE );
return do_normal_idle;
@@@ -2332,7 -2329,7 +2332,7 @@@
gDebugView->mFastTimerView->setVisible(TRUE);
#endif
- LLAppViewer::instance()->startMainloopTimeout();
+ LLAppViewer::instance()->initMainloopTimeout("Mainloop Init");
return do_normal_idle;
}
--
A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and
OpenSim grids
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
