summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelcontents.h
diff options
context:
space:
mode:
authorMelinda Green <melinda@lindenlab.com>2008-12-15 21:21:19 +0000
committerMelinda Green <melinda@lindenlab.com>2008-12-15 21:21:19 +0000
commite1d8dac25a93db837c780428a23f81cbf9109270 (patch)
treea0bcaec0cec1ba6b3ce813764650eada61fcde4f /indra/newview/llpanelcontents.h
parent9c0dbb123376608e464fcd8d1a2e288e01d78a3f (diff)
svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge
Resolving QAR-1051 Merge featurettes batch #4
Diffstat (limited to 'indra/newview/llpanelcontents.h')
-rw-r--r--indra/newview/llpanelcontents.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llpanelcontents.h b/indra/newview/llpanelcontents.h
index 98e53d6de3..e8a00b9c6e 100644
--- a/indra/newview/llpanelcontents.h
+++ b/indra/newview/llpanelcontents.h
@@ -51,6 +51,7 @@ public:
void refresh();
static void onClickNewScript( void* userdata);
+ static void onClickPermissions( void* userdata);
protected:
void getState(LLViewerObject *object);