diff options
| author | BlueWall | 2011-12-02 18:57:57 -0500 |
|---|---|---|
| committer | BlueWall | 2011-12-02 18:57:57 -0500 |
| commit | 21f4ee8a3d3712b44514080fa284ca36c8a1196d (patch) | |
| tree | a6200d79186597f15adaf2b3582390a1a4b2d415 /OpenSim/Capabilities/Handlers/GetTexture | |
| parent | Make fix to Nini for null references in some cases. (diff) | |
| parent | Stop some places where we're trying to reset animations in child agents where... (diff) | |
| download | opensim-SC-21f4ee8a3d3712b44514080fa284ca36c8a1196d.zip opensim-SC-21f4ee8a3d3712b44514080fa284ca36c8a1196d.tar.gz opensim-SC-21f4ee8a3d3712b44514080fa284ca36c8a1196d.tar.bz2 opensim-SC-21f4ee8a3d3712b44514080fa284ca36c8a1196d.tar.xz | |
Merge branch 'master' of /home/opensim/var/repo/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs index e1b4fe7..245d931 100644 --- a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs +++ b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs | |||
| @@ -350,7 +350,5 @@ namespace OpenSim.Capabilities.Handlers | |||
| 350 | } | 350 | } |
| 351 | return null; | 351 | return null; |
| 352 | } | 352 | } |
| 353 | |||
| 354 | |||
| 355 | } | 353 | } |
| 356 | } | 354 | } \ No newline at end of file |