diff options
| author | Melanie | 2011-11-04 01:18:37 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-04 01:18:37 +0000 |
| commit | 24235006f473cec56213705ce70df781cf9bcbc1 (patch) | |
| tree | 7d0e75978d48272827c3f03f087bf79658dd16cf /OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | Rename ForEachAvatar back to ForEachScenePresence. The other changes (diff) | |
| download | opensim-SC_OLD-24235006f473cec56213705ce70df781cf9bcbc1.zip opensim-SC_OLD-24235006f473cec56213705ce70df781cf9bcbc1.tar.gz opensim-SC_OLD-24235006f473cec56213705ce70df781cf9bcbc1.tar.bz2 opensim-SC_OLD-24235006f473cec56213705ce70df781cf9bcbc1.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
OpenSim/Region/CoreModules/LightShare/LightShareModule.cs
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs')
0 files changed, 0 insertions, 0 deletions