diff options
| author | UbitUmarov | 2017-01-06 01:09:42 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-06 01:09:42 +0000 |
| commit | 6172446e2afa53960b4e118e0b2ae199f6e17b3f (patch) | |
| tree | 835b484189907c74259d70e1841c151ea3bb8e3f /OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs | |
| parent | fix merge (diff) | |
| parent | UserLevel must have a trusted source (diff) | |
| download | opensim-SC-6172446e2afa53960b4e118e0b2ae199f6e17b3f.zip opensim-SC-6172446e2afa53960b4e118e0b2ae199f6e17b3f.tar.gz opensim-SC-6172446e2afa53960b4e118e0b2ae199f6e17b3f.tar.bz2 opensim-SC-6172446e2afa53960b4e118e0b2ae199f6e17b3f.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs')
| -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 e5bf919..9843f2e 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs | |||
| @@ -118,7 +118,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
| 118 | // If we're in god mode, we reverse the meaning. Offer | 118 | // If we're in god mode, we reverse the meaning. Offer |
| 119 | // calling card becomes "Take a calling card" for that | 119 | // calling card becomes "Take a calling card" for that |
| 120 | // person, no matter if they agree or not. | 120 | // person, no matter if they agree or not. |
| 121 | if (sp.GodLevel >= 200) | 121 | if (sp.GodController.GodLevel >= 200) |
| 122 | { | 122 | { |
| 123 | CreateCallingCard(client.AgentId, destID, UUID.Zero, true); | 123 | CreateCallingCard(client.AgentId, destID, UUID.Zero, true); |
| 124 | return; | 124 | return; |