Merge branch 'master' of ssh://MyConnection/var/git/opensim
						commit
						fc3e24af9c
					
				| 
						 | 
				
			
			@ -113,7 +113,7 @@ namespace OpenSim.Services.Connectors
 | 
			
		|||
 | 
			
		||||
        public virtual UserAccount GetUserAccount(UUID scopeID, UUID userID)
 | 
			
		||||
        {
 | 
			
		||||
            m_log.DebugFormat("[ACCOUNTS CONNECTOR]: GetUSerAccount {0}", userID);
 | 
			
		||||
            m_log.DebugFormat("[ACCOUNTS CONNECTOR]: GetUserAccount {0}", userID);
 | 
			
		||||
            Dictionary<string, object> sendData = new Dictionary<string, object>();
 | 
			
		||||
            //sendData["SCOPEID"] = scopeID.ToString();
 | 
			
		||||
            sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -84,11 +84,11 @@ namespace OpenSim.Services.Interfaces
 | 
			
		|||
            if (kvp.ContainsKey("ScopeID"))
 | 
			
		||||
                UUID.TryParse(kvp["ScopeID"].ToString(), out ScopeID);
 | 
			
		||||
            if (kvp.ContainsKey("UserLevel"))
 | 
			
		||||
                Convert.ToInt32(kvp["UserLevel"].ToString());
 | 
			
		||||
                UserLevel = Convert.ToInt32(kvp["UserLevel"].ToString());
 | 
			
		||||
            if (kvp.ContainsKey("UserFlags"))
 | 
			
		||||
                Convert.ToInt32(kvp["UserFlags"].ToString());
 | 
			
		||||
                UserFlags = Convert.ToInt32(kvp["UserFlags"].ToString());
 | 
			
		||||
            if (kvp.ContainsKey("UserTitle"))
 | 
			
		||||
                Email = kvp["UserTitle"].ToString();
 | 
			
		||||
                UserTitle = kvp["UserTitle"].ToString();
 | 
			
		||||
 | 
			
		||||
            if (kvp.ContainsKey("Created"))
 | 
			
		||||
                Convert.ToInt32(kvp["Created"].ToString());
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue