Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only spam the logs about missing var region flags when we're not on SL.

Browse Source
This commit is contained in:
Inusaito Sayori
2015-01-07 15:47:14 -05:00
parent c592184aa6
commit f09d399e88
2 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
indra/newview/llviewermessage.cpp
View File

@@ -4520,11 +4520,14 @@ void process_teleport_finish(LLMessageSystem* msg, void**)
// Viewer trusts the simulator. // Viewer trusts the simulator.
gMessageSystem->enableCircuit(sim_host, TRUE); gMessageSystem->enableCircuit(sim_host, TRUE);
// <FS:CR> Aurora Sim // <FS:CR> Aurora Sim
U32 region_size_x = 256; if (!gHippoGridManager->getConnectedGrid()->isSecondLife())
msg->getU32Fast(_PREHASH_Info, _PREHASH_RegionSizeX, region_size_x); {
U32 region_size_y = 256; U32 region_size_x = 256;
msg->getU32Fast(_PREHASH_Info, _PREHASH_RegionSizeY, region_size_y); msg->getU32Fast(_PREHASH_Info, _PREHASH_RegionSizeX, region_size_x);
LLWorld::getInstance()->setRegionSize(region_size_x, region_size_y); U32 region_size_y = 256;
msg->getU32Fast(_PREHASH_Info, _PREHASH_RegionSizeY, region_size_y);
LLWorld::getInstance()->setRegionSize(region_size_x, region_size_y);
}
// </FS:CR> Aurora Sim // </FS:CR> Aurora Sim
LLViewerRegion* regionp = LLWorld::getInstance()->addRegion(region_handle, sim_host); LLViewerRegion* regionp = LLWorld::getInstance()->addRegion(region_handle, sim_host);
@@ -4852,11 +4855,14 @@ void process_crossed_region(LLMessageSystem* msg, void**)
send_complete_agent_movement(sim_host); send_complete_agent_movement(sim_host);
// <FS:CR> Aurora Sim // <FS:CR> Aurora Sim
U32 region_size_x = 256; if (!gHippoGridManager->getConnectedGrid()->isSecondLife())
msg->getU32(_PREHASH_RegionData, _PREHASH_RegionSizeX, region_size_x); {
U32 region_size_y = 256; U32 region_size_x = 256;
msg->getU32(_PREHASH_RegionData, _PREHASH_RegionSizeY, region_size_y); msg->getU32(_PREHASH_RegionData, _PREHASH_RegionSizeX, region_size_x);
LLWorld::getInstance()->setRegionSize(region_size_x, region_size_y); U32 region_size_y = 256;
msg->getU32(_PREHASH_RegionData, _PREHASH_RegionSizeY, region_size_y);
LLWorld::getInstance()->setRegionSize(region_size_x, region_size_y);
}
// </FS:CR> Aurora Sim // </FS:CR> Aurora Sim
LLViewerRegion* regionp = LLWorld::getInstance()->addRegion(region_handle, sim_host); LLViewerRegion* regionp = LLWorld::getInstance()->addRegion(region_handle, sim_host);
regionp->setSeedCapability(seedCap); regionp->setSeedCapability(seedCap);

14
indra/newview/llworld.cpp
View File

@@ -62,6 +62,7 @@
#include "pipeline.h" #include "pipeline.h"
#include "llappviewer.h" // for do_disconnect() #include "llappviewer.h" // for do_disconnect()
#include "llpacketring.h" #include "llpacketring.h"
#include "hippogridmanager.h"
#include <deque> #include <deque>
#include <queue> #include <queue>
@@ -1376,11 +1377,14 @@ void process_enable_simulator(LLMessageSystem *msg, void **user_data)
// Viewer trusts the simulator. // Viewer trusts the simulator.
msg->enableCircuit(sim, TRUE); msg->enableCircuit(sim, TRUE);
// <FS:CR> Aurora Sim // <FS:CR> Aurora Sim
U32 region_size_x = 256; if (!gHippoGridManager->getConnectedGrid()->isSecondLife())
msg->getU32Fast(_PREHASH_SimulatorInfo, _PREHASH_RegionSizeX, region_size_x); {
U32 region_size_y = 256; U32 region_size_x = 256;
msg->getU32Fast(_PREHASH_SimulatorInfo, _PREHASH_RegionSizeY, region_size_y); msg->getU32Fast(_PREHASH_SimulatorInfo, _PREHASH_RegionSizeX, region_size_x);
LLWorld::getInstance()->setRegionSize(region_size_x, region_size_y); U32 region_size_y = 256;
msg->getU32Fast(_PREHASH_SimulatorInfo, _PREHASH_RegionSizeY, region_size_y);
LLWorld::getInstance()->setRegionSize(region_size_x, region_size_y);
}
// </FS:CR> Aurora Sim // </FS:CR> Aurora Sim
LLWorld::getInstance()->addRegion(handle, sim); LLWorld::getInstance()->addRegion(handle, sim);