Backed out changeset: 1862396ac745 - Phoe-3915 - fix linux compile (this was already fixed differently)

Fri, 16 Mar 2012 23:00:42 -0700

author
Tank_Master
date
Fri, 16 Mar 2012 23:00:42 -0700
changeset 1680
f70b0f60e3bb
parent 1679
255e9ae0729f
child 1681
4aa27e7bebb8

Backed out changeset: 1862396ac745 - Phoe-3915 - fix linux compile (this was already fixed differently)

indra/newview/rlvlocks.h file | annotate | diff | revisions
     1.1 --- a/indra/newview/rlvlocks.h	Fri Mar 16 22:53:36 2012 -0700
     1.2 +++ b/indra/newview/rlvlocks.h	Fri Mar 16 23:00:42 2012 -0700
     1.3 @@ -632,9 +632,9 @@
     1.4  	// Block renaming a folder if:
     1.5  	//   - the folder (or one of its descendents) is explicitly locked by:
     1.6  	//		-> a "shared path" => renaming the folder would change the shared path and hence invalidate the lock
     1.7 -	//		-> an attachment point  \
     1.8 +	//		-> an attachment point  ↘
     1.9  	//		-> an attachment        |--> renaming the folder to a "dot" (=invisible) folder would invalidate the lock
    1.10 -	//		-> a wearable type      /
    1.11 +	//		-> a wearable type      ↗
    1.12  	return !hasLockedFolderDescendent(idFolder, ST_SHAREDPATH | ST_ATTACHMENT | ST_ATTACHMENTPOINT | ST_WEARABLETYPE, PERM_MASK_ANY, RLV_LOCK_ANY, true);
    1.13  }
    1.14  

mercurial