diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-12-16 13:31:49 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-12-16 13:31:49 -0500 |
| commit | e774431783fba010b1ea1daaf4df25ccf292833e (patch) | |
| tree | 85a9bc1a3a43e66d5515fa8914769fb7835fc30b | |
| parent | f1acdc56b2209f1cbc0887d4bf64be9aef765cb8 (diff) | |
| parent | 5b40445e663c2237ceeea83827505840cf41b165 (diff) | |
merge changes for storm-1993
| -rwxr-xr-x | doc/contributions.txt | 1 | ||||
| -rwxr-xr-x | indra/newview/llfloaterland.cpp | 11 |
2 files changed, 9 insertions, 3 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 6ad7cb0449..a657daaf69 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -674,6 +674,7 @@ Jonathan Yap OPEN-161 STORM-1953 STORM-1957 + STORM-1993 OPEN-113 STORM-1992 STORM-1989 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); + } } } |