Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diva Canto
commit
4463ebfbc2
|
|
@ -51,10 +51,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
|
|||
m_scene.RegisterModuleInterface<IDialogModule>(this);
|
||||
|
||||
m_scene.AddCommand(
|
||||
this, "alert", "alert <first> <last> <message>", "Send an alert to a user", HandleAlertConsoleCommand);
|
||||
this, "alert", "alert <first> <last> <message>",
|
||||
"Send an alert to a user",
|
||||
HandleAlertConsoleCommand);
|
||||
|
||||
m_scene.AddCommand(
|
||||
this, "alert general", "alert general <message>", "Send an alert to everyone", HandleAlertConsoleCommand);
|
||||
this, "alert general", "alert [general] <message>",
|
||||
"Send an alert to everyone",
|
||||
"If keyword 'general' is omitted, then <message> must be surrounded by quotation marks.",
|
||||
HandleAlertConsoleCommand);
|
||||
}
|
||||
|
||||
public void PostInitialise() {}
|
||||
|
|
@ -173,20 +178,49 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
|
|||
if (m_scene.ConsoleScene() != null && m_scene.ConsoleScene() != m_scene)
|
||||
return;
|
||||
|
||||
if (cmdparams[1] == "general")
|
||||
bool isGeneral = false;
|
||||
string firstName = string.Empty;
|
||||
string lastName = string.Empty;
|
||||
string message = string.Empty;
|
||||
|
||||
if (cmdparams.Length > 1)
|
||||
{
|
||||
string message = CombineParams(cmdparams, 2);
|
||||
firstName = cmdparams[1];
|
||||
isGeneral = firstName.ToLower().Equals("general");
|
||||
}
|
||||
if (cmdparams.Length == 2 && !isGeneral)
|
||||
{
|
||||
// alert "message"
|
||||
message = cmdparams[1];
|
||||
isGeneral = true;
|
||||
}
|
||||
else if (cmdparams.Length > 2 && isGeneral)
|
||||
{
|
||||
// alert general <message>
|
||||
message = CombineParams(cmdparams, 2);
|
||||
}
|
||||
else if (cmdparams.Length > 3)
|
||||
{
|
||||
// alert <first> <last> <message>
|
||||
lastName = cmdparams[2];
|
||||
message = CombineParams(cmdparams, 3);
|
||||
}
|
||||
else
|
||||
{
|
||||
OpenSim.Framework.Console.MainConsole.Instance.Output(
|
||||
"Usage: alert \"message\" | alert general <message> | alert <first> <last> <message>");
|
||||
return;
|
||||
}
|
||||
|
||||
if (isGeneral)
|
||||
{
|
||||
m_log.InfoFormat(
|
||||
"[DIALOG]: Sending general alert in region {0} with message {1}", m_scene.RegionInfo.RegionName, message);
|
||||
"[DIALOG]: Sending general alert in region {0} with message {1}",
|
||||
m_scene.RegionInfo.RegionName, message);
|
||||
SendGeneralAlert(message);
|
||||
}
|
||||
else
|
||||
{
|
||||
string firstName = cmdparams[1];
|
||||
string lastName = cmdparams[2];
|
||||
string message = CombineParams(cmdparams, 3);
|
||||
|
||||
m_log.InfoFormat(
|
||||
"[DIALOG]: Sending alert in region {0} to {1} {2} with message {3}",
|
||||
m_scene.RegionInfo.RegionName, firstName, lastName, message);
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@ namespace OpenSim.Region.CoreModules.InterGrid
|
|||
bool enabled = false;
|
||||
IConfig cfg = null;
|
||||
IConfig httpcfg = null;
|
||||
IConfig startupcfg = null;
|
||||
// IConfig startupcfg = null;
|
||||
try
|
||||
{
|
||||
cfg = config.Configs["OpenGridProtocol"];
|
||||
|
|
@ -117,14 +117,14 @@ namespace OpenSim.Region.CoreModules.InterGrid
|
|||
{
|
||||
|
||||
}
|
||||
try
|
||||
{
|
||||
startupcfg = config.Configs["Startup"];
|
||||
}
|
||||
catch (NullReferenceException)
|
||||
{
|
||||
|
||||
}
|
||||
// try
|
||||
// {
|
||||
// startupcfg = config.Configs["Startup"];
|
||||
// }
|
||||
// catch (NullReferenceException)
|
||||
// {
|
||||
//
|
||||
// }
|
||||
|
||||
// if (startupcfg != null)
|
||||
// {
|
||||
|
|
|
|||
|
|
@ -1,15 +1,25 @@
|
|||
;; Configurations for enabling HG1.5
|
||||
;;
|
||||
;; Run
|
||||
;; $ Robust.exe -inifile Robust.HG.ini
|
||||
|
||||
;; HG1.5 handlers are: OpenSim.Server.Handlers.dll:GatekeeperService
|
||||
;; OpenSim.Server.Handlers.dll:UserAgentService
|
||||
;; Additional OpenSim.Server.Handlers.dll:AssetServiceConnector and
|
||||
;; OpenSim.Server.Handlers.dll:XInventoryInConnector
|
||||
;; are started in port 8002, outside the firewall
|
||||
;;
|
||||
; * Run
|
||||
; * $ Robust.exe -inifile Robust.HG.ini
|
||||
; *
|
||||
|
||||
; * Configurations for enabling HG1.5
|
||||
; *
|
||||
; * HG1.5 handlers are: OpenSim.Server.Handlers.dll:GatekeeperService
|
||||
; * OpenSim.Server.Handlers.dll:UserAgentService
|
||||
; * Additional OpenSim.Server.Handlers.dll:AssetServiceConnector and
|
||||
; * OpenSim.Server.Handlers.dll:XInventoryInConnector
|
||||
; * are started in port 8002, outside the firewall
|
||||
; *
|
||||
; * The startup section lists all the connectors to start up in this server
|
||||
; * instance. This may be only one, or it may be the entire server suite.
|
||||
; * Multiple connectors should be separated by commas.
|
||||
; *
|
||||
; * These are the IN connectors the server uses, the in connectors
|
||||
; * read this config file and load the needed service and database connectors
|
||||
; *
|
||||
; * The full syntax of a connector string is:
|
||||
; * [[<ConfigName>@]<port>/]<dll name>[:<class name>]
|
||||
; *
|
||||
[Startup]
|
||||
ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8003/OpenSim.Server.Handlers.dll:GridUserServiceConnector,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,HGInventoryService@8002/OpenSim.Server.Handlers.dll:XInventoryInConnector,8002/OpenSim.Server.Handlers.dll:AssetServiceConnector"
|
||||
|
||||
|
|
@ -52,10 +62,10 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
|
|||
; *
|
||||
[GridService]
|
||||
LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
|
||||
Realm = "regions"
|
||||
; Realm = "regions"
|
||||
; AllowDuplicateNames = "True"
|
||||
; Check4096 = "False"
|
||||
|
||||
|
||||
;; Next, we can specify properties of regions, including default and fallback regions
|
||||
;; The syntax is: Region_<RegionName> = "<flags>"
|
||||
;; or: Region_<RegionID> = "<flags>"
|
||||
|
|
@ -70,12 +80,13 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
|
|||
|
||||
; * This is the new style authentication service. Currently, only MySQL
|
||||
; * is implemented. "Realm" is the table that is used for user lookup.
|
||||
; * By setting it to "users", you can use the old style users table
|
||||
; * as an authentication source.
|
||||
; * It defaults to "useraccounts", which uses the new style.
|
||||
; * Realm = "users" will use the legacy tables as an authentication source
|
||||
; *
|
||||
[AuthenticationService]
|
||||
; for the server connector
|
||||
LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
|
||||
; Realm = "useraccounts"
|
||||
|
||||
[OpenIdService]
|
||||
; for the server connector
|
||||
|
|
@ -89,7 +100,9 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
|
|||
[UserAccountService]
|
||||
; for the server connector
|
||||
LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
|
||||
;; These are for creating new accounts by the service
|
||||
; Realm = "usersaccounts"
|
||||
|
||||
; These are for creating new accounts by the service
|
||||
AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
|
||||
PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
|
||||
GridService = "OpenSim.Services.GridService.dll:GridService"
|
||||
|
|
@ -161,32 +174,25 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
|
|||
|
||||
; login page: optional: if it exists it will be used to tell the client to use
|
||||
; this as splash page
|
||||
; currently unused
|
||||
;welcome = http://127.0.0.1/welcome
|
||||
|
||||
; helper uri: optional: if it exists if will be used to tell the client to use
|
||||
; this for all economy related things
|
||||
; currently unused
|
||||
;economy = http://127.0.0.1:9000/
|
||||
|
||||
; web page of grid: optional: page providing further information about your grid
|
||||
; currently unused
|
||||
;about = http://127.0.0.1/about/
|
||||
|
||||
; account creation: optional: page providing further information about obtaining
|
||||
; a user account on your grid
|
||||
; currently unused
|
||||
;register = http://127.0.0.1/register
|
||||
|
||||
; help: optional: page providing further assistance for users of your grid
|
||||
; currently unused
|
||||
;help = http://127.0.0.1/help
|
||||
|
||||
; password help: optional: page providing password assistance for users of your grid
|
||||
; currently unused
|
||||
;password = http://127.0.0.1/password
|
||||
|
||||
|
||||
[GatekeeperService]
|
||||
LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
|
||||
;; for the service
|
||||
|
|
@ -200,9 +206,9 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
|
|||
; CHANGE THIS
|
||||
ExternalName = "http://127.0.0.1:8002"
|
||||
|
||||
; Does this grid allow incoming links to any region in it?
|
||||
; If false, HG TPs happen only to the Default regions specified in [GridService] section
|
||||
AllowTeleportsToAnyRegion = true
|
||||
; Does this grid allow incoming links to any region in it?
|
||||
; If false, HG TPs happen only to the Default regions specified in [GridService] section
|
||||
AllowTeleportsToAnyRegion = true
|
||||
|
||||
[UserAgentService]
|
||||
LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"
|
||||
|
|
@ -211,12 +217,12 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
|
|||
GridService = "OpenSim.Services.GridService.dll:GridService"
|
||||
GatekeeperService = "OpenSim.Services.HypergridService.dll:GatekeeperService"
|
||||
|
||||
;; The interface that local users get when they are in other grids.
|
||||
;; This restricts the inventory operations while in other grids.
|
||||
;; Still not completely safe, especially if users perform inventory operations
|
||||
;; while in those grids. The more the user accesses his/her inventory, the more
|
||||
;; those simulators will know about the user's inventory.
|
||||
; * The interface that local users get when they are in other grids.
|
||||
; * This restricts the inventory operations while in other grids.
|
||||
; * Still not completely safe, especially if users perform inventory operations
|
||||
; * while in those grids. The more the user accesses his/her inventory, the more
|
||||
; * those simulators will know about the user's inventory.
|
||||
; *
|
||||
[HGInventoryService]
|
||||
; For the InventoryServiceInConnector
|
||||
LocalServiceModule = "OpenSim.Services.InventoryService.dll:HGInventoryService"
|
||||
|
||||
LocalServiceModule = "OpenSim.Services.InventoryService.dll:HGInventoryService"
|
||||
|
|
|
|||
|
|
@ -1,16 +1,18 @@
|
|||
; * Run
|
||||
; * $ Robust.exe -inifile Robust.ini
|
||||
; *
|
||||
|
||||
; * The startup section lists all the connectors to start up in this server
|
||||
; * instance. This may be only one, or it may be the entire server suite.
|
||||
; * Multiple connectors should be seaprated by commas.
|
||||
; * The startup section lists all the connectors to start up in this server
|
||||
; * instance. This may be only one, or it may be the entire server suite.
|
||||
; * Multiple connectors should be seaprated by commas.
|
||||
; * Multiple connectors should be separated by commas.
|
||||
; *
|
||||
; * These are the IN connectors the server uses, the in connectors
|
||||
; * read this config file and load the needed service and database connectors
|
||||
; *
|
||||
; * The full syntax of a connector string is:
|
||||
; * [[<ConfigName>@]<port>/]<dll name>[:<class name>]
|
||||
; *
|
||||
[Startup]
|
||||
|
||||
ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8003/OpenSim.Server.Handlers.dll:GridUserServiceConnector,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector"
|
||||
|
||||
; * This is common for all services, it's the network setup for the entire
|
||||
|
|
@ -30,7 +32,6 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
|
|||
StorageProvider = "OpenSim.Data.MySQL.dll"
|
||||
ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;Old Guids=true;"
|
||||
|
||||
|
||||
; * As an example, the below configuration precisely mimicks the legacy
|
||||
; * asset server. It is read by the asset IN connector (defined above)
|
||||
; * and it then loads the OUT connector (a local database module). That,
|
||||
|
|
@ -54,8 +55,10 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
|
|||
; *
|
||||
[GridService]
|
||||
LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
|
||||
Realm = "regions"
|
||||
; Realm = "regions"
|
||||
; AllowDuplicateNames = "True"
|
||||
; Check4096 = "False"
|
||||
|
||||
;; Next, we can specify properties of regions, including default and fallback regions
|
||||
;; The syntax is: Region_<RegionName> = "<flags>"
|
||||
;; or: Region_<RegionID> = "<flags>"
|
||||
|
|
@ -70,8 +73,8 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
|
|||
|
||||
; * This is the new style authentication service. Currently, only MySQL
|
||||
; * is implemented. "Realm" is the table that is used for user lookup.
|
||||
; * By setting it to "users", you can use the old style users table
|
||||
; * as an authentication source.
|
||||
; * It defaults to "users", which uses the legacy tables as an
|
||||
; * authentication source.
|
||||
; *
|
||||
[AuthenticationService]
|
||||
; for the server connector
|
||||
|
|
@ -82,15 +85,17 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
|
|||
AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
|
||||
UserAccountServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
|
||||
|
||||
; * This is the new style user service.
|
||||
; * "Realm" is the table that is used for user lookup.
|
||||
; * It defaults to "users", which uses the legacy tables
|
||||
; * This is the new style authentication service. Currently, only MySQL
|
||||
; * is implemented. "Realm" is the table that is used for user lookup.
|
||||
; * It defaults to "useraccounts", which uses the new style.
|
||||
; * Realm = "users" will use the legacy tables as an authentication source
|
||||
; *
|
||||
[UserAccountService]
|
||||
; for the server connector
|
||||
LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
|
||||
; Realm = "useraccounts"
|
||||
;; These are for creating new accounts by the service
|
||||
|
||||
; These are for creating new accounts by the service
|
||||
AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
|
||||
PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
|
||||
GridService = "OpenSim.Services.GridService.dll:GridService"
|
||||
|
|
@ -158,27 +163,21 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
|
|||
|
||||
; login page: optional: if it exists it will be used to tell the client to use
|
||||
; this as splash page
|
||||
; currently unused
|
||||
;welcome = http://127.0.0.1/welcome
|
||||
|
||||
; helper uri: optional: if it exists if will be used to tell the client to use
|
||||
; this for all economy related things
|
||||
; currently unused
|
||||
;economy = http://127.0.0.1:9000/
|
||||
|
||||
; web page of grid: optional: page providing further information about your grid
|
||||
; currently unused
|
||||
;about = http://127.0.0.1/about/
|
||||
|
||||
; account creation: optional: page providing further information about obtaining
|
||||
; a user account on your grid
|
||||
; currently unused
|
||||
;register = http://127.0.0.1/register
|
||||
|
||||
; help: optional: page providing further assistance for users of your grid
|
||||
; currently unused
|
||||
;help = http://127.0.0.1/help
|
||||
|
||||
; password help: optional: page providing password assistance for users of your grid
|
||||
; currently unused
|
||||
;password = http://127.0.0.1/password
|
||||
|
|
|
|||
Loading…
Reference in New Issue