diff options
| author | BlueWall | 2012-10-09 06:44:14 -0400 |
|---|---|---|
| committer | BlueWall | 2012-10-09 06:44:14 -0400 |
| commit | 252af020b05f386f88174cdd28191e0efbeba626 (patch) | |
| tree | f425499b4338fa3a15f51b7621f4d37dec1d5ce7 /OpenSim/Region/CoreModules/Avatar/Friends | |
| parent | Added parts to manage repositories and plugin management (diff) | |
| parent | Fix build break (diff) | |
| download | opensim-SC_OLD-252af020b05f386f88174cdd28191e0efbeba626.zip opensim-SC_OLD-252af020b05f386f88174cdd28191e0efbeba626.tar.gz opensim-SC_OLD-252af020b05f386f88174cdd28191e0efbeba626.tar.bz2 opensim-SC_OLD-252af020b05f386f88174cdd28191e0efbeba626.tar.xz | |
Merge branch 'master' into connector_plugin
Conflicts:
OpenSim/Server/ServerMain.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs index d942e87..5ec0ea9 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs | |||
| @@ -141,7 +141,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
| 141 | client.FirstName+" "+client.LastName, | 141 | client.FirstName+" "+client.LastName, |
| 142 | destID, (byte)211, false, | 142 | destID, (byte)211, false, |
| 143 | String.Empty, | 143 | String.Empty, |
| 144 | transactionID, false, new Vector3(), new byte[0]), | 144 | transactionID, false, new Vector3(), new byte[0], true), |
| 145 | delegate(bool success) {} ); | 145 | delegate(bool success) {} ); |
| 146 | } | 146 | } |
| 147 | } | 147 | } |