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

Support Legacy Region/Estate Environment

Browse Source 
Also Disable Environment Tab when the cap required to use it isn't supported.
This commit is contained in:
Lirusaito
2013-04-17 19:42:56 -04:00
committed by Latif Khalifa
parent ceade84fb0
commit b51615be20
5 changed files with 172 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llregioninfomodel.cpp
View File

@@ -35,6 +35,7 @@
// viewer
#include "llagent.h"
#include "llviewerregion.h"
#include "llestateinfomodel.h" // For supporting legacy environment
void LLRegionInfoModel::reset()
{
@@ -107,6 +108,17 @@ void LLRegionInfoModel::sendRegionTerrain(const LLUUID& invoice) const
strings.push_back(buffer);
buffer = llformat("%f", mSunHour);
strings.push_back(buffer);
if (mUseEstateSun)
{
// Grab estate info, the user decided to set the region back to estate time. JC
LLEstateInfoModel& estate_info = LLEstateInfoModel::instance();
estate_global_time = estate_info.getGlobalTime();
if (!estate_global_time)
{
estate_fixed_sun = estate_info.getUseFixedSun();
estate_sun_hour = estate_info.getSunHour();
}
}
buffer = llformat("%s", (estate_global_time ? "Y" : "N") );
strings.push_back(buffer);
buffer = llformat("%s", (estate_fixed_sun ? "Y" : "N") );