Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

cpu-performance
Justin Clark-Casey (justincc) 2013-06-14 23:55:36 +01:00
commit db9d9d83eb
7 changed files with 37 additions and 10 deletions

View File

@ -63,7 +63,7 @@ namespace OpenSim.Region.DataSnapshot
public Hashtable OnGetSnapshot(Hashtable keysvals) public Hashtable OnGetSnapshot(Hashtable keysvals)
{ {
m_log.Info("[DATASNAPSHOT] Received collection request"); m_log.Debug("[DATASNAPSHOT] Received collection request");
Hashtable reply = new Hashtable(); Hashtable reply = new Hashtable();
int statuscode = 200; int statuscode = 200;
@ -80,7 +80,7 @@ namespace OpenSim.Region.DataSnapshot
public Hashtable OnValidate(Hashtable keysvals) public Hashtable OnValidate(Hashtable keysvals)
{ {
m_log.Info("[DATASNAPSHOT] Received validation request"); m_log.Debug("[DATASNAPSHOT] Received validation request");
Hashtable reply = new Hashtable(); Hashtable reply = new Hashtable();
int statuscode = 200; int statuscode = 200;

View File

@ -120,7 +120,7 @@ namespace OpenSim.Region.DataSnapshot
provider.Stale = false; provider.Stale = false;
m_scenes[provider.GetParentScene] = true; m_scenes[provider.GetParentScene] = true;
m_log.Info("[DATASNAPSHOT]: Generated fragment response for provider type " + provider.Name); m_log.Debug("[DATASNAPSHOT]: Generated fragment response for provider type " + provider.Name);
} }
else else
{ {
@ -134,7 +134,7 @@ namespace OpenSim.Region.DataSnapshot
data = factory.ImportNode(node, true); data = factory.ImportNode(node, true);
} }
m_log.Info("[DATASNAPSHOT]: Retrieved fragment response for provider type " + provider.Name); m_log.Debug("[DATASNAPSHOT]: Retrieved fragment response for provider type " + provider.Name);
} }
return data; return data;
@ -154,7 +154,7 @@ namespace OpenSim.Region.DataSnapshot
if (!m_scenes[scene]) if (!m_scenes[scene])
{ {
m_log.Info("[DATASNAPSHOT]: Attempting to retrieve snapshot from cache."); m_log.Debug("[DATASNAPSHOT]: Attempting to retrieve snapshot from cache.");
//get snapshot from cache //get snapshot from cache
String path = DataFileNameScene(scene); String path = DataFileNameScene(scene);
@ -168,11 +168,11 @@ namespace OpenSim.Region.DataSnapshot
regionElement = factory.ImportNode(node, true); regionElement = factory.ImportNode(node, true);
} }
m_log.Info("[DATASNAPSHOT]: Obtained snapshot from cache for " + scene.RegionInfo.RegionName); m_log.Debug("[DATASNAPSHOT]: Obtained snapshot from cache for " + scene.RegionInfo.RegionName);
} }
else else
{ {
m_log.Info("[DATASNAPSHOT]: Attempting to generate snapshot."); m_log.Debug("[DATASNAPSHOT]: Attempting to generate snapshot.");
//make snapshot //make snapshot
regionElement = MakeRegionNode(scene, factory); regionElement = MakeRegionNode(scene, factory);
@ -211,7 +211,7 @@ namespace OpenSim.Region.DataSnapshot
m_scenes[scene] = false; m_scenes[scene] = false;
m_log.Info("[DATASNAPSHOT]: Generated new snapshot for " + scene.RegionInfo.RegionName); m_log.Debug("[DATASNAPSHOT]: Generated new snapshot for " + scene.RegionInfo.RegionName);
} }
return regionElement; return regionElement;

View File

@ -190,6 +190,7 @@ namespace OpenSim.Services.LLLoginService
private BuddyList m_buddyList = null; private BuddyList m_buddyList = null;
private string currency; private string currency;
private string classifiedFee;
static LLLoginResponse() static LLLoginResponse()
{ {
@ -227,7 +228,7 @@ namespace OpenSim.Services.LLLoginService
GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService, GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService,
string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message, string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message,
GridRegion home, IPEndPoint clientIP, string mapTileURL, string profileURL, string openIDURL, string searchURL, string currency, GridRegion home, IPEndPoint clientIP, string mapTileURL, string profileURL, string openIDURL, string searchURL, string currency,
string DSTZone, string destinationsURL, string avatarsURL) string DSTZone, string destinationsURL, string avatarsURL, string classifiedFee)
: this() : this()
{ {
FillOutInventoryData(invSkel, libService); FillOutInventoryData(invSkel, libService);
@ -251,6 +252,8 @@ namespace OpenSim.Services.LLLoginService
SearchURL = searchURL; SearchURL = searchURL;
Currency = currency; Currency = currency;
ClassifiedFee = classifiedFee;
FillOutHomeData(pinfo, home); FillOutHomeData(pinfo, home);
LookAt = String.Format("[r{0},r{1},r{2}]", lookAt.X, lookAt.Y, lookAt.Z); LookAt = String.Format("[r{0},r{1},r{2}]", lookAt.X, lookAt.Y, lookAt.Z);
@ -463,6 +466,7 @@ namespace OpenSim.Services.LLLoginService
searchURL = String.Empty; searchURL = String.Empty;
currency = String.Empty; currency = String.Empty;
ClassifiedFee = "0";
} }
@ -555,6 +559,9 @@ namespace OpenSim.Services.LLLoginService
// responseData["real_currency"] = currency; // responseData["real_currency"] = currency;
responseData["currency"] = currency; responseData["currency"] = currency;
} }
if (ClassifiedFee != String.Empty)
responseData["classified_fee"] = ClassifiedFee;
responseData["login"] = "true"; responseData["login"] = "true";
@ -659,6 +666,9 @@ namespace OpenSim.Services.LLLoginService
if (searchURL != String.Empty) if (searchURL != String.Empty)
map["search"] = OSD.FromString(searchURL); map["search"] = OSD.FromString(searchURL);
if (ClassifiedFee != String.Empty)
map["classified_fee"] = OSD.FromString(ClassifiedFee);
if (m_buddyList != null) if (m_buddyList != null)
{ {
map["buddy-list"] = ArrayListToOSDArray(m_buddyList.ToArray()); map["buddy-list"] = ArrayListToOSDArray(m_buddyList.ToArray());
@ -1064,6 +1074,12 @@ namespace OpenSim.Services.LLLoginService
set { currency = value; } set { currency = value; }
} }
public string ClassifiedFee
{
get { return classifiedFee; }
set { classifiedFee = value; }
}
public string DestinationsURL public string DestinationsURL
{ {
get; set; get; set;

View File

@ -78,6 +78,7 @@ namespace OpenSim.Services.LLLoginService
protected string m_OpenIDURL; protected string m_OpenIDURL;
protected string m_SearchURL; protected string m_SearchURL;
protected string m_Currency; protected string m_Currency;
protected string m_ClassifiedFee;
protected string m_DestinationGuide; protected string m_DestinationGuide;
protected string m_AvatarPicker; protected string m_AvatarPicker;
@ -119,6 +120,7 @@ namespace OpenSim.Services.LLLoginService
m_OpenIDURL = m_LoginServerConfig.GetString("OpenIDServerURL", String.Empty); m_OpenIDURL = m_LoginServerConfig.GetString("OpenIDServerURL", String.Empty);
m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty); m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty);
m_Currency = m_LoginServerConfig.GetString("Currency", string.Empty); m_Currency = m_LoginServerConfig.GetString("Currency", string.Empty);
m_ClassifiedFee = m_LoginServerConfig.GetString("ClassifiedFee", string.Empty);
m_DestinationGuide = m_LoginServerConfig.GetString ("DestinationGuide", string.Empty); m_DestinationGuide = m_LoginServerConfig.GetString ("DestinationGuide", string.Empty);
m_AvatarPicker = m_LoginServerConfig.GetString ("AvatarPicker", string.Empty); m_AvatarPicker = m_LoginServerConfig.GetString ("AvatarPicker", string.Empty);
@ -458,7 +460,7 @@ namespace OpenSim.Services.LLLoginService
account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService, account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService,
where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP,
m_MapTileURL, m_ProfileURL, m_OpenIDURL, m_SearchURL, m_Currency, m_DSTZone, m_MapTileURL, m_ProfileURL, m_OpenIDURL, m_SearchURL, m_Currency, m_DSTZone,
m_DestinationGuide, m_AvatarPicker); m_DestinationGuide, m_AvatarPicker, m_ClassifiedFee);
m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to {0} {1}", firstName, lastName); m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to {0} {1}", firstName, lastName);

View File

@ -311,6 +311,9 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
;; Ask co-operative viewers to use a different currency name ;; Ask co-operative viewers to use a different currency name
;Currency = "" ;Currency = ""
;; Set minimum fee to publish classified
; ClassifiedFee = 0
WelcomeMessage = "Welcome, Avatar!" WelcomeMessage = "Welcome, Avatar!"
AllowRemoteSetLoginLevel = "false" AllowRemoteSetLoginLevel = "false"

View File

@ -274,6 +274,9 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto
; Ask co-operative viewers to use a different currency name ; Ask co-operative viewers to use a different currency name
;Currency = "" ;Currency = ""
;; Set minimum fee to publish classified
; ClassifiedFee = 0
WelcomeMessage = "Welcome, Avatar!" WelcomeMessage = "Welcome, Avatar!"
AllowRemoteSetLoginLevel = "false" AllowRemoteSetLoginLevel = "false"

View File

@ -115,6 +115,9 @@
;; Ask co-operative viewers to use a different currency name ;; Ask co-operative viewers to use a different currency name
;Currency = "" ;Currency = ""
;; Set minimum fee to publish classified
; ClassifiedFee = 0
;; Regular expressions for controlling which client versions are accepted/denied. ;; Regular expressions for controlling which client versions are accepted/denied.
;; An empty string means nothing is checked. ;; An empty string means nothing is checked.
;; ;;