Merge branch 'master' of /home/opensim/src/opensim

cpu-performance
BlueWall 2013-06-13 09:27:13 -04:00
commit d7f3d7efd2
5 changed files with 29 additions and 2 deletions

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";
} }
@ -556,6 +560,9 @@ namespace OpenSim.Services.LLLoginService
responseData["currency"] = currency; responseData["currency"] = currency;
} }
if (ClassifiedFee != String.Empty)
responseData["classified_fee"] = ClassifiedFee;
responseData["login"] = "true"; responseData["login"] = "true";
return responseData; return responseData;
@ -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.
;; ;;