diff options
| author | unknown | 2008-12-19 00:17:06 -0700 |
|---|---|---|
| committer | unknown | 2008-12-19 00:17:06 -0700 |
| commit | e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554 (patch) | |
| tree | f4ae195b239b9ae3ed8ca53c2dc6f20a24ff7dc7 /linden/indra/newview/llselectmgr.cpp | |
| parent | fuckyougit (diff) | |
| parent | 1.1 wip copy (diff) | |
| download | meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.zip meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.tar.gz meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.tar.bz2 meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.tar.xz | |
resolved merge conflicts
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/llselectmgr.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp index 2e4983c..90b1bd3 100644 --- a/linden/indra/newview/llselectmgr.cpp +++ b/linden/indra/newview/llselectmgr.cpp | |||
| @@ -5745,7 +5745,8 @@ BOOL LLSelectMgr::canSelectObject(LLViewerObject* object) | |||
| 5745 | } | 5745 | } |
| 5746 | 5746 | ||
| 5747 | if ((gSavedSettings.getBOOL("SelectOwnedOnly") && !object->permYouOwner()) || | 5747 | if ((gSavedSettings.getBOOL("SelectOwnedOnly") && !object->permYouOwner()) || |
| 5748 | (gSavedSettings.getBOOL("SelectMovableOnly") && !object->permMove())) | 5748 | (gSavedSettings.getBOOL("SelectMovableOnly") && !object->permMove()) || |
| 5749 | (gSavedSettings.getBOOL("SelectCopyableOnly") && !object->permCopy())) | ||
| 5749 | { | 5750 | { |
| 5750 | // only select my own objects | 5751 | // only select my own objects |
| 5751 | return FALSE; | 5752 | return FALSE; |