aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs
diff options
context:
space:
mode:
authorMelanie2012-01-14 06:09:19 +0000
committerMelanie2012-01-14 06:09:19 +0000
commit43128c9016ea4482bdc38b1b099b67929e28a68b (patch)
treeeafe72f6235ac4d148d4778d67a131a5228ca2dd /OpenSim/Data/MSSQL/MSSQLUserAccountData.cs
parentAllow SmtpClients and other SSL users to work with our cert handler installed (diff)
parentAllow SmtpClients and other SSL users to work with our cert handler installed (diff)
downloadopensim-SC_OLD-43128c9016ea4482bdc38b1b099b67929e28a68b.zip
opensim-SC_OLD-43128c9016ea4482bdc38b1b099b67929e28a68b.tar.gz
opensim-SC_OLD-43128c9016ea4482bdc38b1b099b67929e28a68b.tar.bz2
opensim-SC_OLD-43128c9016ea4482bdc38b1b099b67929e28a68b.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Data/MSSQL/MSSQLUserAccountData.cs')
0 files changed, 0 insertions, 0 deletions