diff options
| author | Diva Canto | 2010-01-10 15:39:49 -0800 |
|---|---|---|
| committer | Diva Canto | 2010-01-10 15:39:49 -0800 |
| commit | e3d1d824e120b3c548d9138f1ca22c3512f035f8 (patch) | |
| tree | 34dd99dc0ca7489ce9b7ded6aaccc7c23b53d91b /OpenSim | |
| parent | Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/open... (diff) | |
| parent | Remove a little bit more if master avatar (diff) | |
| download | opensim-SC-e3d1d824e120b3c548d9138f1ca22c3512f035f8.zip opensim-SC-e3d1d824e120b3c548d9138f1ca22c3512f035f8.tar.gz opensim-SC-e3d1d824e120b3c548d9138f1ca22c3512f035f8.tar.bz2 opensim-SC-e3d1d824e120b3c548d9138f1ca22c3512f035f8.tar.xz | |
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs index 3c5e8c9..e11cbd7 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs | |||
| @@ -477,12 +477,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat | |||
| 477 | case "%host" : | 477 | case "%host" : |
| 478 | result = result.Replace(vvar, rs.Host); | 478 | result = result.Replace(vvar, rs.Host); |
| 479 | break; | 479 | break; |
| 480 | case "%master1" : | ||
| 481 | result = result.Replace(vvar, rs.MA1); | ||
| 482 | break; | ||
| 483 | case "%master2" : | ||
| 484 | result = result.Replace(vvar, rs.MA2); | ||
| 485 | break; | ||
| 486 | case "%locx" : | 480 | case "%locx" : |
| 487 | result = result.Replace(vvar, rs.LocX); | 481 | result = result.Replace(vvar, rs.LocX); |
| 488 | break; | 482 | break; |