diff options
| author | Melanie | 2012-01-28 04:05:53 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-28 04:05:53 +0000 |
| commit | abffda269f3bdedea7e5e339c120cd2b65b2a36c (patch) | |
| tree | cb2537156fb9b4d91f5ce61987475f27e2e57f03 /OpenSim/Data | |
| parent | Completely disable NPC being sensed as agents, the abuse potential is too great (diff) | |
| parent | Add an overloaded SceneObjectPart.UpdateTextureEntry(Primitive.TextureEntry t... (diff) | |
| download | opensim-SC-abffda269f3bdedea7e5e339c120cd2b65b2a36c.zip opensim-SC-abffda269f3bdedea7e5e339c120cd2b65b2a36c.tar.gz opensim-SC-abffda269f3bdedea7e5e339c120cd2b65b2a36c.tar.bz2 opensim-SC-abffda269f3bdedea7e5e339c120cd2b65b2a36c.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
Diffstat (limited to 'OpenSim/Data')
0 files changed, 0 insertions, 0 deletions