diff options
author | Merov Linden <merov@lindenlab.com> | 2014-02-24 13:23:39 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2014-02-24 13:23:39 -0800 |
commit | 245de340d72d0a836cc7525cf8143c232b00235b (patch) | |
tree | 1436dbf2dfac1deecee4a2ded9a891b7bf68bfb5 /indra/newview/llfloaterland.cpp | |
parent | e6efb8f297fa21d76876f391f57d8abdd065584a (diff) | |
parent | de8fea13627cc5978b8a6135802a52864a11c39a (diff) |
Pull merge from viewer-release
Diffstat (limited to 'indra/newview/llfloaterland.cpp')
-rwxr-xr-x | indra/newview/llfloaterland.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 6c8e81e563..b16ef6dd79 100755 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -1791,10 +1791,15 @@ void LLPanelLandObjects::onCommitClean(LLUICtrl *caller, void* user_data) LLParcel* parcel = lop->mParcel->getParcel(); if (parcel) { - lop->mOtherTime = atoi(lop->mCleanOtherObjectsTime->getText().c_str()); + S32 return_time = atoi(lop->mCleanOtherObjectsTime->getText().c_str()); + // Only send return time if it has changed + if (return_time != lop->mOtherTime) + { + lop->mOtherTime = return_time; - parcel->setCleanOtherTime(lop->mOtherTime); - send_other_clean_time_message(parcel->getLocalID(), lop->mOtherTime); + parcel->setCleanOtherTime(lop->mOtherTime); + send_other_clean_time_message(parcel->getLocalID(), lop->mOtherTime); + } } } |