aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-06-046-283/+271
|\
| * bring TestLoadIarV0_1AbsentUsers() back onlineJustin Clark-Casey (justincc)2010-06-041-63/+56
| * bring TestIarV0_1WithEscapedChars() back onlineJustin Clark-Casey (justincc)2010-06-041-89/+72
| * bring test TestLoadIarV0_1ExistingUsers() back onlineJustin Clark-Casey (justincc)2010-06-041-81/+76
| * remove pointless mock user account service since the real one can now be easi...Justin Clark-Casey (justincc)2010-06-042-2/+2
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-06-043-29/+44
| |\
| | * Fixed a couple of buglets in Friendship offers / acceptance / decline when av...Diva Canto2010-06-043-29/+44
| * | get TestSaveIarV0_1() working again by setting up an OpenSim.Data.Null.UserAu...Justin Clark-Casey (justincc)2010-06-042-3/+5
| |/
| * Continuing refactor. Refactor DeRezObject to deal with multiple objectsMelanie Thielker2010-06-012-2/+29
* | Continuing refactor. Refactor DeRezObject to deal with multiple objectsMelanie Thielker2010-06-012-2/+29
* | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Tom Grimshaw2010-05-297-230/+220
|\ \
| * \ Merge branch 'master' into careminster-presence-refactorMelanie2010-05-287-230/+220
| |\ \ | | |/
| | * get TestSaveIarV0_1() uncommented but not running as a test yet since I didn'...Justin Clark-Casey (justincc)2010-05-281-106/+99
| | * restore InventoryArchiverTests.TestReplicateArchivePathToUserInventory() to w...Justin Clark-Casey (justincc)2010-05-281-51/+37
| | * fission UserAccountService.HandleCreateUser() into two methods, one which han...Justin Clark-Casey (justincc)2010-05-281-52/+50
| | * Add ability to load IARs directly from URIsJustin Clark-Casey (justincc)2010-05-282-6/+18
| | * minor: remove mono compiler warningJustin Clark-Casey (justincc)2010-05-281-1/+1
| | * refactor: move GetStream and URI methods from ArchiveReadRequest -> ArchiveHe...Justin Clark-Casey (justincc)2010-05-283-64/+65
| | * Revert "Comment noisy "CONNECTION DEBUGGING" messages, because they push more"Melanie2010-05-271-13/+1
| | * Comment noisy "CONNECTION DEBUGGING" messages, because they push moreMelanie Thielker2010-05-271-1/+13
* | | Stop IGridService from throwing a fatal exception when an IPEndPoint cannot b...Tom Grimshaw2010-05-291-11/+20
|/ /
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-241-2/+3
|\ \ | |/
| * minor: expand upon comments about not scheduling two full updates for attachm...Justin Clark-Casey (justincc)2010-05-241-2/+3
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-215-42/+106
|\ \ | |/
| * Fix a problem where SceneGraph.AddSceneObject() would return false on success...Justin Clark-Casey (justincc)2010-05-211-1/+0
| * make oar object filename/pathname creation a helper methodJustin Clark-Casey (justincc)2010-05-214-38/+75
| * add prim item and test asset save in save oar unit testJustin Clark-Casey (justincc)2010-05-212-3/+31
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-211-9/+7
|\ \ | |/
| * Only send dialogs and notices to root agents, not child agentsJustin Clark-Casey (justincc)2010-05-211-9/+7
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-213-8/+26
|\ \ | |/
| * Removed sessionID from GridUserservice again. Removed parcel crossing detecti...Diva Canto2010-05-203-13/+5
| * Merging slimupdates2unknown2010-05-205-6/+32
| |\
| | * * Added sessionID to IGridUserService.SetLastPosition(), as some connectors w...unknown2010-05-203-6/+6
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into slimupd...unknown2010-05-152-2/+7
| | |\
| | * | Implements three new OSSL functions for parcel management: osParcelJoin joins...OpenSim Master2010-05-132-0/+26
* | | | Fix to the scenario where we send an agent to a neighbouring sim (via telepor...Tom Grimshaw2010-05-182-0/+32
* | | | Prevent an "index out of range" error on loginMelanie Thielker2010-05-181-2/+5
* | | | Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va...Melanie2010-05-161-1/+2
|\ \ \ \
| * | | | Don't convert UUID -> ToString for every friend (Minor optimisation based on ...Tom Grimshaw2010-05-121-1/+2
* | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-163-3/+8
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Finalized the client's TCP IP address verification process for HG1.5.Diva Canto2010-05-151-1/+1
| | |/ | |/|
| * | Address symptom of Mantis 4588 (though not the cause) by moving the avatar de...Justin Clark-Casey (justincc)2010-05-151-2/+3
| * | Apply patch from http://opensimulator.org/mantis/bug_view_page.php?bug_id=4671Justin Clark-Casey2010-05-141-0/+4
| |/
* | Correct an odd merge anomalyTom Grimshaw2010-05-101-1/+1
* | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Tom Grimshaw2010-05-107-116/+116
|\ \
| * \ Merge branch 'master' into careminster-presence-refactorMelanie2010-05-103-18/+19
| |\ \ | | |/
| | * * Fixed spamming the assets table with map tiles. The tile image ID is now st...Diva Canto2010-05-093-18/+19
| * | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-094-98/+97
| |\ \ | | |/
| | * * Added missing loggout notification to home grid upon agents logging out in ...Diva Canto2010-05-081-0/+8
| | * More cleaning on presence. Friends online/offline works again.Diva Canto2010-05-083-98/+89