From e1016b5bc7cda03fed98b10f1ee5615245495e00 Mon Sep 17 00:00:00 2001
From: "Mark Palange (Mani)" <palange@lindenlab.com>
Date: Mon, 8 Nov 2010 09:49:38 -0800
Subject: [PATCH] Removed refrences to SLPlugin from LLUpdaterService and test.
---
.../updater/llupdaterservice.cpp | 30 -------------------
.../updater/tests/llupdaterservice_test.cpp | 18 -----------
2 files changed, 48 deletions(-)
diff --git a/indra/viewer_components/updater/llupdaterservice.cpp b/indra/viewer_components/updater/llupdaterservice.cpp
index dc48606cbc8..4292da1528c 100644
--- a/indra/viewer_components/updater/llupdaterservice.cpp
+++ b/indra/viewer_components/updater/llupdaterservice.cpp
@@ -31,7 +31,6 @@
#include "llupdaterservice.h"
#include "llupdatechecker.h"
-#include "llpluginprocessparent.h"
#include <boost/scoped_ptr.hpp>
#include <boost/weak_ptr.hpp>
@@ -42,7 +41,6 @@
boost::weak_ptr<LLUpdaterServiceImpl> gUpdater;
class LLUpdaterServiceImpl :
- public LLPluginProcessParentOwner,
public LLUpdateChecker::Client,
public LLUpdateDownloader::Client
{
@@ -56,7 +54,6 @@ class LLUpdaterServiceImpl :
unsigned int mCheckPeriod;
bool mIsChecking;
- boost::scoped_ptr<LLPluginProcessParent> mPlugin;
LLUpdateChecker mUpdateChecker;
LLUpdateDownloader mUpdateDownloader;
@@ -70,12 +67,6 @@ class LLUpdaterServiceImpl :
LLUpdaterServiceImpl();
virtual ~LLUpdaterServiceImpl();
- // LLPluginProcessParentOwner interfaces
- virtual void receivePluginMessage(const LLPluginMessage &message);
- virtual bool receivePluginMessageEarly(const LLPluginMessage &message);
- virtual void pluginLaunchFailed();
- virtual void pluginDied();
-
void setParams(const std::string& protocol_version,
const std::string& url,
const std::string& path,
@@ -110,12 +101,9 @@ const std::string LLUpdaterServiceImpl::sListenerName = "LLUpdaterServiceImpl";
LLUpdaterServiceImpl::LLUpdaterServiceImpl() :
mIsChecking(false),
mCheckPeriod(0),
- mPlugin(0),
mUpdateChecker(*this),
mUpdateDownloader(*this)
{
- // Create the plugin parent, this is the owner.
- mPlugin.reset(new LLPluginProcessParent(this));
}
LLUpdaterServiceImpl::~LLUpdaterServiceImpl()
@@ -124,24 +112,6 @@ LLUpdaterServiceImpl::~LLUpdaterServiceImpl()
LLEventPumps::instance().obtain("mainloop").stopListening(sListenerName);
}
-// LLPluginProcessParentOwner interfaces
-void LLUpdaterServiceImpl::receivePluginMessage(const LLPluginMessage &message)
-{
-}
-
-bool LLUpdaterServiceImpl::receivePluginMessageEarly(const LLPluginMessage &message)
-{
- return false;
-};
-
-void LLUpdaterServiceImpl::pluginLaunchFailed()
-{
-};
-
-void LLUpdaterServiceImpl::pluginDied()
-{
-};
-
void LLUpdaterServiceImpl::setParams(const std::string& protocol_version,
const std::string& url,
const std::string& path,
diff --git a/indra/viewer_components/updater/tests/llupdaterservice_test.cpp b/indra/viewer_components/updater/tests/llupdaterservice_test.cpp
index 20d0f8fa093..7f45ae51fb5 100644
--- a/indra/viewer_components/updater/tests/llupdaterservice_test.cpp
+++ b/indra/viewer_components/updater/tests/llupdaterservice_test.cpp
@@ -36,28 +36,10 @@
#include "../../../test/debug.h"
#include "llevents.h"
-#include "llpluginprocessparent.h"
/*****************************************************************************
* MOCK'd
*****************************************************************************/
-LLPluginProcessParentOwner::~LLPluginProcessParentOwner() {}
-LLPluginProcessParent::LLPluginProcessParent(LLPluginProcessParentOwner *owner)
-: mOwner(owner),
- mIncomingQueueMutex(gAPRPoolp)
-{
-}
-
-LLPluginProcessParent::~LLPluginProcessParent() {}
-LLPluginMessagePipeOwner::LLPluginMessagePipeOwner(){}
-LLPluginMessagePipeOwner::~LLPluginMessagePipeOwner(){}
-void LLPluginProcessParent::receiveMessageRaw(const std::string &message) {}
-int LLPluginMessagePipeOwner::socketError(int) { return 0; }
-void LLPluginProcessParent::setMessagePipe(LLPluginMessagePipe *message_pipe) {}
-void LLPluginMessagePipeOwner::setMessagePipe(class LLPluginMessagePipe *) {}
-LLPluginMessage::~LLPluginMessage() {}
-LLPluginMessage::LLPluginMessage(LLPluginMessage const&) {}
-
LLUpdateChecker::LLUpdateChecker(LLUpdateChecker::Client & client)
{}
void LLUpdateChecker::check(std::string const & protocolVersion, std::string const & hostUrl,
--
GitLab