diff options
author | Jacek Antonelli | 2008-08-15 23:44:54 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:44:54 -0500 |
commit | b2afb8800bb033a04bb3ecdf0363068d56648ef1 (patch) | |
tree | 3568129b5bbddb47cd39d622b4137a8fbff4abaf /linden/indra/newview/llpanelobject.cpp | |
parent | Second Life viewer sources 1.14.0.1 (diff) | |
download | meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.zip meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.gz meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.bz2 meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.xz |
Second Life viewer sources 1.15.0.2
Diffstat (limited to 'linden/indra/newview/llpanelobject.cpp')
-rw-r--r-- | linden/indra/newview/llpanelobject.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/linden/indra/newview/llpanelobject.cpp b/linden/indra/newview/llpanelobject.cpp index 590eb63..fb740a4 100644 --- a/linden/indra/newview/llpanelobject.cpp +++ b/linden/indra/newview/llpanelobject.cpp | |||
@@ -4,6 +4,7 @@ | |||
4 | * | 4 | * |
5 | * Copyright (c) 2001-2007, Linden Research, Inc. | 5 | * Copyright (c) 2001-2007, Linden Research, Inc. |
6 | * | 6 | * |
7 | * Second Life Viewer Source Code | ||
7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
@@ -447,17 +448,17 @@ void LLPanelObject::getState( ) | |||
447 | // Physics checkbox | 448 | // Physics checkbox |
448 | mIsPhysical = root_objectp->usePhysics(); | 449 | mIsPhysical = root_objectp->usePhysics(); |
449 | mCheckPhysics->set( mIsPhysical ); | 450 | mCheckPhysics->set( mIsPhysical ); |
450 | mCheckPhysics->setEnabled( roots_selected==1 | 451 | mCheckPhysics->setEnabled( roots_selected>0 |
451 | && (editable || gAgent.isGodlike()) | 452 | && (editable || gAgent.isGodlike()) |
452 | && !is_flexible); | 453 | && !is_flexible); |
453 | 454 | ||
454 | mIsTemporary = root_objectp->flagTemporaryOnRez(); | 455 | mIsTemporary = root_objectp->flagTemporaryOnRez(); |
455 | mCheckTemporary->set( mIsTemporary ); | 456 | mCheckTemporary->set( mIsTemporary ); |
456 | mCheckTemporary->setEnabled( roots_selected==1 && editable ); | 457 | mCheckTemporary->setEnabled( roots_selected>0 && editable ); |
457 | 458 | ||
458 | mIsPhantom = root_objectp->flagPhantom(); | 459 | mIsPhantom = root_objectp->flagPhantom(); |
459 | mCheckPhantom->set( mIsPhantom ); | 460 | mCheckPhantom->set( mIsPhantom ); |
460 | mCheckPhantom->setEnabled( roots_selected==1 && editable && !is_flexible ); | 461 | mCheckPhantom->setEnabled( roots_selected>0 && editable && !is_flexible ); |
461 | 462 | ||
462 | #if 0 // 1.9.2 | 463 | #if 0 // 1.9.2 |
463 | mCastShadows = root_objectp->flagCastShadows(); | 464 | mCastShadows = root_objectp->flagCastShadows(); |