aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloaterpermissionsmgr.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:34 -0500
committerJacek Antonelli2008-08-15 23:45:34 -0500
commitcd17687f01420952712a500107e0f93e7ab8d5f8 (patch)
treece48c2b706f2c1176290e39fb555fbdf6648ce01 /linden/indra/newview/llfloaterpermissionsmgr.cpp
parentSecond Life viewer sources 1.19.0.5 (diff)
downloadmeta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.zip
meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.gz
meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.bz2
meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.xz
Second Life viewer sources 1.19.1.0
Diffstat (limited to 'linden/indra/newview/llfloaterpermissionsmgr.cpp')
-rw-r--r--linden/indra/newview/llfloaterpermissionsmgr.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/linden/indra/newview/llfloaterpermissionsmgr.cpp b/linden/indra/newview/llfloaterpermissionsmgr.cpp
index 6447d72..9cc223e 100644
--- a/linden/indra/newview/llfloaterpermissionsmgr.cpp
+++ b/linden/indra/newview/llfloaterpermissionsmgr.cpp
@@ -75,9 +75,9 @@ void LLFloaterPermissionsMgr::processPermissionsList(LLMessageSystem* msg, void*
75LLFloaterPermissionsMgr::LLFloaterPermissionsMgr() : LLFloater("floater_perm_mgr", "PermissionsManagerRect", "Permissions Manager", TRUE, MIN_PERM_MGR_WIDTH, 75LLFloaterPermissionsMgr::LLFloaterPermissionsMgr() : LLFloater("floater_perm_mgr", "PermissionsManagerRect", "Permissions Manager", TRUE, MIN_PERM_MGR_WIDTH,
76 MIN_PERM_MGR_HEIGHT) 76 MIN_PERM_MGR_HEIGHT)
77{ 77{
78 S32 y = mRect.getHeight() - VPAD - LINE; 78 S32 y = getRect().getHeight() - VPAD - LINE;
79 LLRect scrollable_container_rect(0, y, mRect.getWidth(), 0); 79 LLRect scrollable_container_rect(0, y, getRect().getWidth(), 0);
80 LLRect permissions_rect(0, 0, mRect.getWidth() - HPAD - HPAD, 0); 80 LLRect permissions_rect(0, 0, getRect().getWidth() - HPAD - HPAD, 0);
81 mPermissions = new LLPermissionsView(permissions_rect); 81 mPermissions = new LLPermissionsView(permissions_rect);
82 mScroller = new LLScrollableContainerView( 82 mScroller = new LLScrollableContainerView(
83 "permissions container", 83 "permissions container",
@@ -124,9 +124,9 @@ void LLPermissionsView::addPermissionsData(const LLString& object_name, const LL
124 // grow to make room for new element 124 // grow to make room for new element
125 LLPermissionsData* perm_datap = new LLPermissionsData(object_id, permissions_flags); 125 LLPermissionsData* perm_datap = new LLPermissionsData(object_id, permissions_flags);
126 126
127 reshape(mRect.getWidth(), mRect.getHeight() + LINE + VPAD + BTN_HEIGHT + VPAD); 127 reshape(getRect().getWidth(), getRect().getHeight() + LINE + VPAD + BTN_HEIGHT + VPAD);
128 S32 y = mRect.getHeight() - LINE - VPAD; 128 S32 y = getRect().getHeight() - LINE - VPAD;
129 LLRect label_rect(HPAD, y + LINE, mRect.getWidth(), y); 129 LLRect label_rect(HPAD, y + LINE, getRect().getWidth(), y);
130 LLTextBox* text = new LLTextBox("perm_label", label_rect, object_name.c_str()); 130 LLTextBox* text = new LLTextBox("perm_label", label_rect, object_name.c_str());
131 text->setFollows(FOLLOWS_LEFT | FOLLOWS_RIGHT | FOLLOWS_BOTTOM); 131 text->setFollows(FOLLOWS_LEFT | FOLLOWS_RIGHT | FOLLOWS_BOTTOM);
132 addChild(text); 132 addChild(text);