diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llstartup.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp index 0b6d75f..164e038 100644 --- a/linden/indra/newview/llstartup.cpp +++ b/linden/indra/newview/llstartup.cpp | |||
@@ -368,7 +368,7 @@ bool idle_startup() | |||
368 | static U64 first_sim_handle = 0; | 368 | static U64 first_sim_handle = 0; |
369 | static LLHost first_sim; | 369 | static LLHost first_sim; |
370 | static std::string first_sim_seed_cap; | 370 | static std::string first_sim_seed_cap; |
371 | static U32 first_sim_size_x = 256; | 371 | static U32 first_sim_size_x = 256; |
372 | static U32 first_sim_size_y = 256; | 372 | static U32 first_sim_size_y = 256; |
373 | 373 | ||
374 | static LLVector3 initial_sun_direction(1.f, 0.f, 0.f); | 374 | static LLVector3 initial_sun_direction(1.f, 0.f, 0.f); |
@@ -1622,16 +1622,16 @@ bool idle_startup() | |||
1622 | first_sim_handle = to_region_handle(region_x, region_y); | 1622 | first_sim_handle = to_region_handle(region_x, region_y); |
1623 | } | 1623 | } |
1624 | 1624 | ||
1625 | text = LLUserAuth::getInstance()->getResponse("region_size_x"); | 1625 | text = LLUserAuth::getInstance()->getResponse("region_size_x"); |
1626 | if(!text.empty()) { | 1626 | if(!text.empty()) { |
1627 | first_sim_size_x = strtoul(text.c_str(), NULL, 10); | 1627 | first_sim_size_x = strtoul(text.c_str(), NULL, 10); |
1628 | LLViewerParcelMgr::getInstance()->init(first_sim_size_x); | 1628 | LLViewerParcelMgr::getInstance()->init(first_sim_size_x); |
1629 | } | 1629 | } |
1630 | 1630 | ||
1631 | //region Y size is currently unused, major refactoring required. - Patrick Sapinski (2/10/2011) | 1631 | //region Y size is currently unused, major refactoring required. - Patrick Sapinski (2/10/2011) |
1632 | text = LLUserAuth::getInstance()->getResponse("region_size_y"); | 1632 | text = LLUserAuth::getInstance()->getResponse("region_size_y"); |
1633 | if(!text.empty()) first_sim_size_y = strtoul(text.c_str(), NULL, 10); | 1633 | if(!text.empty()) first_sim_size_y = strtoul(text.c_str(), NULL, 10); |
1634 | 1634 | ||
1635 | const std::string look_at_str = LLUserAuth::getInstance()->getResponse("look_at"); | 1635 | const std::string look_at_str = LLUserAuth::getInstance()->getResponse("look_at"); |
1636 | if (!look_at_str.empty()) | 1636 | if (!look_at_str.empty()) |
1637 | { | 1637 | { |