From 66646c27f33f390796d3e83e7428945f7af1e046 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Tue, 4 Jun 2024 10:46:32 -0400
Subject: [PATCH] Make Alchemy SLPlugin explicitly incompatible with other
viewers
---
indra/llplugin/llplugininstance.cpp | 2 +-
indra/llplugin/llpluginprocesschild.cpp | 2 +-
indra/llplugin/llpluginprocessparent.cpp | 2 +-
indra/media_plugins/base/media_plugin_base.cpp | 6 +++---
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/indra/llplugin/llplugininstance.cpp b/indra/llplugin/llplugininstance.cpp
index e46bc7d15c1..fab8d4750fc 100644
--- a/indra/llplugin/llplugininstance.cpp
+++ b/indra/llplugin/llplugininstance.cpp
@@ -40,7 +40,7 @@
/**
* TODO:DOC describe how it's used
*/
-const char *LLPluginInstance::PLUGIN_INIT_FUNCTION_NAME = "LLPluginInitEntryPoint";
+const char *LLPluginInstance::PLUGIN_INIT_FUNCTION_NAME = "ALPluginInitEntryPoint";
/**
* Constructor.
diff --git a/indra/llplugin/llpluginprocesschild.cpp b/indra/llplugin/llpluginprocesschild.cpp
index 0e3e843c214..581759e0d63 100644
--- a/indra/llplugin/llpluginprocesschild.cpp
+++ b/indra/llplugin/llpluginprocesschild.cpp
@@ -385,7 +385,7 @@ void LLPluginProcessChild::receiveMessageRaw(const std::string &message)
passMessage = false;
std::string message_name = parsed.getName();
- if (message_name == "load_plugin")
+ if (message_name == "load_plugin_alchemy")
{
mPluginFile = parsed.getValue("file");
mPluginDir = parsed.getValue("dir");
diff --git a/indra/llplugin/llpluginprocessparent.cpp b/indra/llplugin/llpluginprocessparent.cpp
index b810c497ee5..a1949e52a58 100644
--- a/indra/llplugin/llpluginprocessparent.cpp
+++ b/indra/llplugin/llpluginprocessparent.cpp
@@ -627,7 +627,7 @@ void LLPluginProcessParent::idle(void)
// Send the message to load the plugin
{
- LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_INTERNAL, "load_plugin");
+ LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_INTERNAL, "load_plugin_alchemy");
message.setValue("file", mPluginFile);
message.setValue("dir", mPluginDir);
sendMessage(message);
diff --git a/indra/media_plugins/base/media_plugin_base.cpp b/indra/media_plugins/base/media_plugin_base.cpp
index ccaa43cfb50..f1b5e59e915 100644
--- a/indra/media_plugins/base/media_plugin_base.cpp
+++ b/indra/media_plugins/base/media_plugin_base.cpp
@@ -32,7 +32,7 @@
#include "media_plugin_base.h"
-// TODO: Make sure that the only symbol exported from this library is LLPluginInitEntryPoint
+// TODO: Make sure that the only symbol exported from this library is ALPluginInitEntryPoint
////////////////////////////////////////////////////////////////////////////////
/// Media plugin constructor.
///
@@ -176,7 +176,7 @@ void MediaPluginBase::sendStatus()
extern "C"
{
- LLSYMEXPORT int LLPluginInitEntryPoint(LLPluginInstance::sendMessageFunction host_send_func, void *host_user_data, LLPluginInstance::sendMessageFunction *plugin_send_func, void **plugin_user_data);
+ LLSYMEXPORT int ALPluginInitEntryPoint(LLPluginInstance::sendMessageFunction host_send_func, void *host_user_data, LLPluginInstance::sendMessageFunction *plugin_send_func, void **plugin_user_data);
}
/**
@@ -191,7 +191,7 @@ extern "C"
*
*/
LLSYMEXPORT int
-LLPluginInitEntryPoint(LLPluginInstance::sendMessageFunction host_send_func, void *host_user_data, LLPluginInstance::sendMessageFunction *plugin_send_func, void **plugin_user_data)
+ALPluginInitEntryPoint(LLPluginInstance::sendMessageFunction host_send_func, void *host_user_data, LLPluginInstance::sendMessageFunction *plugin_send_func, void **plugin_user_data)
{
return init_media_plugin(host_send_func, host_user_data, plugin_send_func, plugin_user_data);
}
--
GitLab