Sync llviewermedia with alchemy.

This commit is contained in:
Inusaito Sayori
2015-08-12 20:09:21 -04:00
parent b16058dc83
commit 46db0d8d50
3 changed files with 382 additions and 369 deletions

View File

@@ -943,7 +943,6 @@ P2(meshHeaderResponder, connect_30s);
P2(meshLODResponder, connect_30s);
P2(meshPhysicsShapeResponder, connect_30s);
P2(meshSkinInfoResponder, connect_30s);
P(mimeDiscoveryResponder);
P(moderationResponder);
P(objectCostResponder);
P(physicsFlagsResponder);
@@ -960,8 +959,6 @@ P(translationReceiver);
P(uploadModelPremissionsResponder);
P(verifiedDestinationResponder);
P(viewerChatterBoxInvitationAcceptResponder);
P(viewerMediaOpenIDResponder);
P(viewerMediaWebProfileResponder);
P(viewerStatsResponder);
P(voiceCallCapResponder);
P(webProfileResponders);

File diff suppressed because it is too large Load Diff

View File

@@ -56,7 +56,6 @@ class LLMediaEntry;
class LLVOVolume;
class LLMimeDiscoveryResponder;
class LLPluginCookieStore;
class AIHTTPHeaders;
typedef LLPointer<LLViewerMediaImpl> viewer_media_t;
///////////////////////////////////////////////////////////////////////////////
@@ -92,6 +91,7 @@ public:
typedef std::list<LLViewerMediaImpl*> impl_list;
typedef std::map<LLUUID, LLViewerMediaImpl*> impl_id_map;
// Special case early init for just web browser component
// so we can show login screen. See .cpp file for details. JC
@@ -137,7 +137,7 @@ public:
static bool isParcelMediaPlaying();
static bool isParcelAudioPlaying();
static bool onAuthSubmit(const LLSD& notification, const LLSD& response);
static void onAuthSubmit(const LLSD& notification, const LLSD& response);
// Clear all cookies for all plugins
static void clearAllCookies();
@@ -169,7 +169,7 @@ public:
static void setOnlyAudibleMediaTextureID(const LLUUID& texture_id);
static AIHTTPHeaders getHeaders();
static class AIHTTPHeaders getHeaders();
private:
static void setOpenIDCookie();