zontreck/OpenSim-Sasquatch
1
0
Fork 0
mirror of https://github.com/OpenSim-NGC/OpenSim-Sasquatch.git synced 2024-11-21 14:29:10 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/develop' into release/0.9.3.9030

Browse source
This commit is contained in:
Mike Dickson 2024-09-23 12:38:52 -04:00
commit 010a033169
5 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OpenSim/Region/CoreModules/ServiceConnectorsOut/Experience/RemoteExperienceServiceConnector.cs
View file

@ -42,14 +42,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Experience
IConfig moduleConfig = source.Configs["Modules"];
if (moduleConfig != null)
{
string name = moduleConfig.GetString("InventoryServices", "");
string name = moduleConfig.GetString("ExperienceServices", "");
if (name == Name)
{
m_remoteConnector = new ExperienceServicesConnector(source);
m_Enabled = true;
m_log.Info("[XINVENTORY CONNECTOR]: Remote ExperienceService enabled");
m_log.Info("[EXPERIENCE CONNECTOR]: Remote ExperienceService enabled");
}
}
}

15
OpenSim/Services/ExperienceService/ExperienceService.cs
View file

@ -63,21 +63,18 @@ namespace OpenSim.Services.ExperienceService
lastName = MainConsole.Instance.Prompt("Experience owner last name", "Resident");
else lastName = cmdparams[3];
UUID suggestedKey = UUID.Random();
if (cmdparams.Length < 5)
experienceKey = MainConsole.Instance.Prompt("Experience Key (leave blank for random)", "");
experienceKey = MainConsole.Instance.Prompt("Experience Key", suggestedKey.ToString());
else experienceKey = cmdparams[4];
UUID newExperienceKey;
if (experienceKey == "")
newExperienceKey = UUID.Random();
else
if(!UUID.TryParse(experienceKey, out newExperienceKey))
{
if(!UUID.TryParse(experienceKey, out newExperienceKey))
{
MainConsole.Instance.Output("Invalid UUID");
return;
}
MainConsole.Instance.Output("Invalid UUID");
return;
}
UserAccount account = m_UserService.GetUserAccount(UUID.Zero, firstName, lastName);

1
bin/config-include/Grid.ini
View file

@ -26,6 +26,7 @@
MapImageService = "MapImageServiceModule"
SearchModule = "BasicSearchModule"
MuteListService = "RemoteMuteListServicesConnector"
ExperienceServices = "RemoteExperienceServicesConnector"
LandServiceInConnector = true
NeighbourServiceInConnector = true

2
bin/config-include/GridCommon.ini.example
View file

@ -236,7 +236,7 @@
MuteListServerURI = "${Const|PrivURL}:${Const|PrivatePort}"
[ExperienceService]
LocalServiceModule = "OpenSim.Services.Connectors.dll:RemoteExperienceServiceConnector"
LocalServiceModule = "OpenSim.Services.Connectors.dll:RemoteExperienceServicesConnector"
;
; Change this to your grid-wide experience server

1
bin/config-include/GridHypergrid.ini
View file

@ -32,6 +32,7 @@
UserManagementModule = "HGUserManagementModule"
SearchModule = "BasicSearchModule"
MuteListService = "RemoteMuteListServicesConnector"
ExperienceServices = "RemoteExperienceServicesConnector"
LandServiceInConnector = true
NeighbourServiceInConnector = true