Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
						commit
						e3d1d824e1
					
				| 
						 | 
				
			
			@ -477,12 +477,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
 | 
			
		|||
                    case "%host"    :
 | 
			
		||||
                        result = result.Replace(vvar, rs.Host);
 | 
			
		||||
                        break;
 | 
			
		||||
                    case "%master1" :
 | 
			
		||||
                        result = result.Replace(vvar, rs.MA1);
 | 
			
		||||
                        break;
 | 
			
		||||
                    case "%master2" :
 | 
			
		||||
                        result = result.Replace(vvar, rs.MA2);
 | 
			
		||||
                        break;
 | 
			
		||||
                    case "%locx"    :
 | 
			
		||||
                        result = result.Replace(vvar, rs.LocX);
 | 
			
		||||
                        break;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue