aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs
diff options
context:
space:
mode:
authorMelanie2012-09-17 14:15:22 +0100
committerMelanie2012-09-17 14:15:22 +0100
commit1dd75fcdb476d20b96efba64a842ac82000c400d (patch)
treeb51eed8de604358841d3cb56db267eaf379c3d3f /OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs
parentMerge branch 'avination' into careminster (diff)
parentpreventing a null reference exception from being thrown (diff)
downloadopensim-SC-1dd75fcdb476d20b96efba64a842ac82000c400d.zip
opensim-SC-1dd75fcdb476d20b96efba64a842ac82000c400d.tar.gz
opensim-SC-1dd75fcdb476d20b96efba64a842ac82000c400d.tar.bz2
opensim-SC-1dd75fcdb476d20b96efba64a842ac82000c400d.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs')
0 files changed, 0 insertions, 0 deletions