livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BUG-226547 Crashfixes

andreykproductengine 2019-03-18 17:08:17 +02:00
parent bf8530c936
commit 7171e581f9
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
indra/newview/llfloatereditextdaycycle.cpp
View File

@ -927,19 +927,9 @@ void LLFloaterEditExtDayCycle::onFrameSliderCallback(const LLSD &data)
{
std::string curslider = mFramesSlider->getCurSlider();
F32 sliderpos(0.0);
if (curslider.empty())
if (!curslider.empty() && mEditDay)
{
S32 x(0), y(0);
LLUI::getMousePositionLocal(mFramesSlider, &x, &y);
sliderpos = mFramesSlider->getSliderValueFromPos(x, y);
}
else
{
sliderpos = mFramesSlider->getCurSliderValue();
F32 sliderpos = mFramesSlider->getCurSliderValue();
keymap_t::iterator it = mSliderKeyMap.find(curslider);
if (it != mSliderKeyMap.end())
@ -1528,7 +1518,11 @@ void LLFloaterEditExtDayCycle::synchronizeTabs()
LLTabContainer * tabs = mWaterTabLayoutContainer->getChild<LLTabContainer>(TABS_WATER);
if (mCurrentTrack == LLSettingsDay::TRACK_WATER)
{
if (!mFramesSlider->getCurSlider().empty())
if (!mEditDay)
{
canedit = false;
}
else if (!mFramesSlider->getCurSlider().empty())
{
canedit = !mIsPlaying;
// either search mEditDay or retrieve from mSliderKeyMap
@ -1557,7 +1551,11 @@ void LLFloaterEditExtDayCycle::synchronizeTabs()
tabs = mSkyTabLayoutContainer->getChild<LLTabContainer>(TABS_SKYS);
if (mCurrentTrack != LLSettingsDay::TRACK_WATER)
{
if (!mFramesSlider->getCurSlider().empty())
if (!mEditDay)
{
canedit = false;
}
else if (!mFramesSlider->getCurSlider().empty())
{
canedit = !mIsPlaying;
// either search mEditDay or retrieve from mSliderKeyMap

7
indra/newview/llpanelenvironment.cpp
View File

@ -335,9 +335,12 @@ void LLPanelEnvironmentInfo::refreshFromEstate()
std::string LLPanelEnvironmentInfo::getNameForTrackIndex(S32 index)
{
std::string invname;
if (mCurrentEnvironment->mDayCycleName.empty())
if (mCurrentEnvironment || index < LLSettingsDay::TRACK_WATER || index >= LLSettingsDay::TRACK_MAX)
{
invname = getString(STRING_EMPTY_NAME);
}
else if (mCurrentEnvironment->mDayCycleName.empty())
{
invname = mCurrentEnvironment->mNameList[index];