OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Fix a bug in the friends module that causes a friend not to appear online when they were. 

* A few things for testing.
* This makes a modification to the region registration with the grid server so that the region can send it a chosen password to identify itself.  It will not cause any errors, if either one are not updated.
0.6.0-stable
Teravus Ovares 2008-04-13 22:47:12 +00:00
parent 7dec345d9a
commit be93c0f29a
6 changed files with 898 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Framework/RegionInfo.cs
View File

@ -216,6 +216,7 @@ namespace OpenSim.Framework
public string MasterAvatarFirstName = String.Empty; public string MasterAvatarFirstName = String.Empty;
public string MasterAvatarLastName = String.Empty; public string MasterAvatarLastName = String.Empty;
public string MasterAvatarSandboxPassword = String.Empty; public string MasterAvatarSandboxPassword = String.Empty;
public string regionSecret = LLUUID.Random().ToString();
public string proxyUrl = ""; public string proxyUrl = "";
public LLUUID originRegionID = LLUUID.Zero; public LLUUID originRegionID = LLUUID.Zero;

17
OpenSim/Grid/GridServer/GridManager.cs
View File

@ -530,7 +530,22 @@ namespace OpenSim.Grid.GridServer
sim.regionRecvKey = String.Empty; sim.regionRecvKey = String.Empty;
sim.regionSendKey = String.Empty; sim.regionSendKey = String.Empty;
sim.regionSecret = Config.SimRecvKey;
if (requestData.ContainsKey("region_secret"))
{
string regionsecret = (string)requestData["region_secret"];
if (regionsecret.Length > 0)
sim.regionSecret = regionsecret;
else
sim.regionSecret = Config.SimRecvKey;
}
else
{
sim.regionSecret = Config.SimRecvKey;
}
sim.regionDataURI = String.Empty; sim.regionDataURI = String.Empty;
sim.regionAssetURI = Config.DefaultAssetServer; sim.regionAssetURI = Config.DefaultAssetServer;
sim.regionAssetRecvKey = Config.AssetRecvKey; sim.regionAssetRecvKey = Config.AssetRecvKey;

1
OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
View File

@ -112,6 +112,7 @@ namespace OpenSim.Region.Communications.OGS1
GridParams["map-image-id"] = regionInfo.EstateSettings.terrainImageID.ToString(); GridParams["map-image-id"] = regionInfo.EstateSettings.terrainImageID.ToString();
GridParams["originUUID"] = regionInfo.originRegionID.ToString(); GridParams["originUUID"] = regionInfo.originRegionID.ToString();
GridParams["server_uri"] = regionInfo.ServerURI; GridParams["server_uri"] = regionInfo.ServerURI;
GridParams["region_secret"] = regionInfo.regionSecret;
// part of an initial brutish effort to provide accurate information (as per the xml region spec) // part of an initial brutish effort to provide accurate information (as per the xml region spec)
// wrt the ownership of a given region // wrt the ownership of a given region

885
OpenSim/Region/Environment/Modules/BetaGridLikeMoneyModule.cs
View File

File diff suppressed because it is too large Load Diff

2
OpenSim/Region/Environment/Modules/FriendsModule.cs
View File

@ -190,7 +190,7 @@ namespace OpenSim.Region.Environment.Modules
List<LLUUID> updateUsers = new List<LLUUID>(); List<LLUUID> updateUsers = new List<LLUUID>();
foreach (FriendListItem fli in lfli) foreach (FriendListItem fli in lfli)
{ {
if (fli.onlinestatus = true) if (fli.onlinestatus == true)
{ {
updateUsers.Add(fli.Friend); updateUsers.Add(fli.Friend);
} }

9
bin/OpenSim.ini.example
View File

@ -306,7 +306,14 @@ snapshot_cache_directory = "DataSnapshot"
data_services="http://metaverseink.com/cgi-bin/register.py" data_services="http://metaverseink.com/cgi-bin/register.py"
[Economy] [Economy]
; These economy values get used in the BetaGridLikeMoneyModule ; These economy values get used in the BetaGridLikeMoneyModule. - This module is for demonstration only -
; In grid mode, use this currency XMLRPC server. Leave blank for normal functionality
CurrencyServer = ""
; "http://192.168.1.127/currency.php"
; In grid mode, this is the land XMLRPC server. Leave blank for normal functionality
LandServer = ""
;"http://192.168.1.127/landtool.php"
; 45000 is the highest value that the sim could possibly report because of protocol constraints ; 45000 is the highest value that the sim could possibly report because of protocol constraints
ObjectCapacity = 45000 ObjectCapacity = 45000