aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs
diff options
context:
space:
mode:
authorMelanie2012-02-10 10:20:51 +0000
committerMelanie2012-02-10 10:20:51 +0000
commit215acbcc9667077fc665be6d5f81c66cf989891e (patch)
tree291a607c6fd648b3488d6cc8f05a84ff4f134446 /OpenSim/Region/CoreModules/LightShare/LightShareModule.cs
parentMerge branch 'master' into careminster (diff)
parentFix: Unable to remove AV from friend list (sqldb-bug) http://opensimulator.or... (diff)
downloadopensim-SC-215acbcc9667077fc665be6d5f81c66cf989891e.zip
opensim-SC-215acbcc9667077fc665be6d5f81c66cf989891e.tar.gz
opensim-SC-215acbcc9667077fc665be6d5f81c66cf989891e.tar.bz2
opensim-SC-215acbcc9667077fc665be6d5f81c66cf989891e.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/LightShare/LightShareModule.cs')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-12-15 20:09:59 +0000