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/Profile/BasicProfileModule.cs | |
| parent | Merge branch 'master' into bulletsim (diff) | |
| parent | Removed unused AddPrimShape methods in PhysicsScene caused by merge conflicts (diff) | |
| download | opensim-SC-2c11f7fc38ba14e041ed0e648088d574dadaaffe.zip opensim-SC-2c11f7fc38ba14e041ed0e648088d574dadaaffe.tar.gz opensim-SC-2c11f7fc38ba14e041ed0e648088d574dadaaffe.tar.bz2 opensim-SC-2c11f7fc38ba14e041ed0e648088d574dadaaffe.tar.xz | |
Merge branch 'master' into bulletsim
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs index 079e1b6..dee0ad4 100644 --- a/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs | |||
| @@ -134,7 +134,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Profile | |||
| 134 | if (!(s is Scene)) | 134 | if (!(s is Scene)) |
| 135 | return; | 135 | return; |
| 136 | 136 | ||
| 137 | Scene scene = (Scene)s; | 137 | // Scene scene = (Scene)s; |
| 138 | 138 | ||
| 139 | string profileUrl = String.Empty; | 139 | string profileUrl = String.Empty; |
| 140 | string aboutText = String.Empty; | 140 | string aboutText = String.Empty; |