Second Life viewer sources 1.18.3.2-RC

1 files changed, 6 insertions, 4 deletions

diff --git a/linden/indra/newview/llviewerregion.cpp b/linden/indra/newview/llviewerregion.cpp
index 0a21e45..6378b01 100644
--- a/linden/indra/newview/llviewerregion.cpp
+++ b/linden/indra/newview/llviewerregion.cpp
@@ -1207,9 +1207,9 @@ public:
                 llinfos << "BaseCapabilitiesComplete::error "
                         << statusNum << ": " << reason << llendl;
                 
-                if (STATE_SEED_GRANTED_WAIT == gStartupState)
+                if (STATE_SEED_GRANTED_WAIT == LLStartUp::getStartupState())
                 {
-                        gStartupState = STATE_SEED_CAP_GRANTED;
+                        LLStartUp::setStartupState( STATE_SEED_CAP_GRANTED );
                 }
     }
 
@@ -1223,9 +1223,9 @@ public:
                                 << iter->first << llendl;
                 }
                 
-                if (STATE_SEED_GRANTED_WAIT == gStartupState)
+                if (STATE_SEED_GRANTED_WAIT == LLStartUp::getStartupState())
                 {
-                        gStartupState = STATE_SEED_CAP_GRANTED;
+                        LLStartUp::setStartupState( STATE_SEED_CAP_GRANTED );
                 }
         }
 
@@ -1275,6 +1275,8 @@ void LLViewerRegion::setSeedCapability(const std::string& url)
         capabilityNames.append("ParcelVoiceInfoRequest");
         capabilityNames.append("ChatSessionRequest");
         capabilityNames.append("ProvisionVoiceAccountRequest");
+        capabilityNames.append("ServerReleaseNotes");
+        capabilityNames.append("CopyInventoryFromNotecard");
 
         llinfos << "posting to seed " << url << llendl;