From e988fffbca2199156ed656a091409394246f929d Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Thu, 7 Nov 2013 16:27:38 -0500
Subject: STORM-68 Add initial support to use a capability for setting default
 object permissions on the server.

---
 indra/newview/llviewerregion.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra/newview/llviewerregion.cpp')

diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index e3cb985ddb..7b5721cb39 100644
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -70,6 +70,7 @@
 #include "stringize.h"
 #include "llviewercontrol.h"
 #include "llsdserialize.h"
+#include "llfloaterperms.h"
 
 #ifdef LL_WINDOWS
 	#pragma warning(disable:4355)
@@ -1485,6 +1486,8 @@ void LLViewerRegion::unpackRegionHandshake()
 	msg->nextBlock("RegionInfo");
 	msg->addU32("Flags", 0x0 );
 	msg->sendReliable(host);
+
+	LLFloaterPermsDefault::updateCap();
 }
 
 void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames)
@@ -1494,6 +1497,7 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames)
 	capabilityNames.append("ChatSessionRequest");
 	capabilityNames.append("CopyInventoryFromNotecard");
 	capabilityNames.append("CreateInventoryCategory");
+	capabilityNames.append("DefaultObjectPermissions");
 	capabilityNames.append("DispatchRegionInfo");
 	capabilityNames.append("EstateChangeInfo");
 	capabilityNames.append("EventQueueGet");
-- 
cgit v1.3