1 files changed, 16 insertions, 1 deletions

diff --git a/linden/indra/newview/llviewerregion.cpp b/linden/indra/newview/llviewerregion.cpp
index d93c425..a8047b8 100644
--- a/linden/indra/newview/llviewerregion.cpp
+++ b/linden/indra/newview/llviewerregion.cpp
@@ -127,6 +127,8 @@ public:
                         }
                 }
                 
+                mRegion->setCapabilitiesReceived(true);
+
                 if (STATE_SEED_GRANTED_WAIT == LLStartUp::getStartupState())
                 {
                         LLStartUp::setStartupState( STATE_SEED_CAP_GRANTED );
@@ -172,7 +174,8 @@ LLViewerRegion::LLViewerRegion(const U64 &handle,
         mCacheEntriesCount(0),
         mCacheID(),
         mEventPoll(NULL),
-        mReleaseNotesRequested(FALSE)
+        mReleaseNotesRequested(FALSE),
+        mCapabilitiesReceived(false)
 {
         mWidth = region_width_meters;
         mOriginGlobal = from_region_handle(handle); 
@@ -1431,6 +1434,8 @@ void LLViewerRegion::setSeedCapability(const std::string& url)
         capabilityNames.append("FetchInventory");
         capabilityNames.append("FetchLib");
         capabilityNames.append("FetchLibDescendents");
+        capabilityNames.append("GetDisplayNames");
+        capabilityNames.append("SetDisplayName");
         capabilityNames.append("GetTexture");
         capabilityNames.append("GroupProposalBallot");
         capabilityNames.append("HomeLocation");
@@ -1509,6 +1514,16 @@ std::string LLViewerRegion::getCapability(const std::string& name) const
         return iter->second;
 }
 
+bool LLViewerRegion::capabilitiesReceived() const
+{
+        return mCapabilitiesReceived;
+}
+
+void LLViewerRegion::setCapabilitiesReceived(bool received)
+{
+        mCapabilitiesReceived = received;
+}
+
 void LLViewerRegion::logActiveCapabilities() const
 {
         int count = 0;