diff options
| author | Dan Lake | 2011-07-20 15:01:32 -0700 |
|---|---|---|
| committer | Dan Lake | 2011-07-20 15:01:32 -0700 |
| commit | 2c11f7fc38ba14e041ed0e648088d574dadaaffe (patch) | |
| tree | d593e3d1130e78ec74a11650d413f451a9a844da /OpenSim/Region/CoreModules/Avatar/Lure | |
| parent | Merge branch 'master' into bulletsim (diff) | |
| parent | Removed unused AddPrimShape methods in PhysicsScene caused by merge conflicts (diff) | |
| download | opensim-SC_OLD-2c11f7fc38ba14e041ed0e648088d574dadaaffe.zip opensim-SC_OLD-2c11f7fc38ba14e041ed0e648088d574dadaaffe.tar.gz opensim-SC_OLD-2c11f7fc38ba14e041ed0e648088d574dadaaffe.tar.bz2 opensim-SC_OLD-2c11f7fc38ba14e041ed0e648088d574dadaaffe.tar.xz | |
Merge branch 'master' into bulletsim
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Lure')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs index c82cfd2..d687e6a 100644 --- a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs | |||
| @@ -196,7 +196,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure | |||
| 196 | if (!(client.Scene is Scene)) | 196 | if (!(client.Scene is Scene)) |
| 197 | return; | 197 | return; |
| 198 | 198 | ||
| 199 | Scene scene = (Scene)(client.Scene); | 199 | // Scene scene = (Scene)(client.Scene); |
| 200 | 200 | ||
| 201 | GridInstantMessage im = null; | 201 | GridInstantMessage im = null; |
| 202 | if (m_PendingLures.TryGetValue(lureID, out im)) | 202 | if (m_PendingLures.TryGetValue(lureID, out im)) |