diff options
author | Logan Dethrow <log@lindenlab.com> | 2013-03-28 18:08:11 -0400 |
---|---|---|
committer | Logan Dethrow <log@lindenlab.com> | 2013-03-28 18:08:11 -0400 |
commit | 203da72c5fa6a833859a14b3f3db4588d772fba0 (patch) | |
tree | f30a23ad5dde45dd73ff160575021d02cb7b28ca /indra/newview/llstartup.cpp | |
parent | d02296d51b907dcde839e48fbb84d3546307f6e5 (diff) | |
parent | cfd35b8b22e8043ab14c57f6ee6108cea471a1ab (diff) |
Automated merge with ssh://bitbucket.org/lindenlab/sunshine-internal
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r-- | indra/newview/llstartup.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 8b71f1067f..e4627b132f 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -1279,6 +1279,8 @@ bool idle_startup() LLViewerRegion *regionp = LLWorld::getInstance()->getRegionFromHandle(gFirstSimHandle); LL_INFOS("AppInit") << "Adding initial simulator " << regionp->getOriginGlobal() << LL_ENDL; + LL_DEBUGS("CrossingCaps") << "Calling setSeedCapability from init_idle(). Seed cap == " + << gFirstSimSeedCap << LL_ENDL; regionp->setSeedCapability(gFirstSimSeedCap); LL_DEBUGS("AppInit") << "Waiting for seed grant ...." << LL_ENDL; display_startup(); |