summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterperms.h
diff options
context:
space:
mode:
authorCinder Roxley <cinder.roxley@phoenixviewer.com>2013-06-27 21:35:23 -0600
committerCinder Roxley <cinder.roxley@phoenixviewer.com>2013-06-27 21:35:23 -0600
commit35b27d558caa8a719e6648e0bf3129629c1cc5fa (patch)
tree6a1d20ad270bd7df3141e91ec9ba0ff0a080a6fc /indra/newview/llfloaterperms.h
parent38c1cd2d29fa48b1a28a6ba1d7ef49ae00c9a5e0 (diff)
parent6060e5e46acbeb20a301070a0fd0efea029d33d0 (diff)
Merged lindenlab/viewer-release into default
Diffstat (limited to 'indra/newview/llfloaterperms.h')
-rwxr-xr-x[-rw-r--r--]indra/newview/llfloaterperms.h0
1 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/llfloaterperms.h b/indra/newview/llfloaterperms.h
index 6b65f4b0cd..6b65f4b0cd 100644..100755
--- a/indra/newview/llfloaterperms.h
+++ b/indra/newview/llfloaterperms.h