aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorroot2011-06-303-12/+49
|\
| * Hack around with the NPC module to get osNpcCreate() partially working again.Justin Clark-Casey (justincc)2011-06-291-1/+2
| * Tell hypergridders when their teleports fail because of the 4096 limit rather...Justin Clark-Casey (justincc)2011-06-242-11/+47
* | Remove friends debug spamMelanie2011-06-201-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-112-3/+4
|\ \ | |/
| * 3rd way of reseting the HG Map. This time, don't use the grid service; instea...Diva Canto2011-06-101-25/+0
| * New method for resetting the map on HG: do it only once upon changing grids, ...Diva Canto2011-06-101-0/+26
| * Change the name of the newest command to "show names" so that it doesn't conf...Diva Canto2011-06-091-2/+2
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-095-22/+300
|\ \ | |/
| * Fixed "Unknown User" listed as creator/owner on prims created with the Build ...Diva Canto2011-06-081-8/+66
| * Narrow down the exception catching to exactly the exception of interest. This...Diva Canto2011-06-051-1/+1
| * Added prefix HG to the name of the landmark item in inventory, as a soft remi...Diva Canto2011-06-032-4/+11
| * oopsDiva Canto2011-06-031-1/+1
| * HG Landmarks now working.Diva Canto2011-06-033-2/+82
| * HG Landmarks being created. WARNING: new config var under [HGInventoryAccessM...Diva Canto2011-06-032-2/+20
| * Moved CreateNewInventoryItem to the InventoryAccessModule in preparation for ...Diva Canto2011-06-031-1/+78
| * HG lures working! Friends can offer friends HG teleports via the profile. WAR...Diva Canto2011-05-271-1/+1
| * Commented a few extra debug messages.Diva Canto2011-05-261-2/+2
| * Added necessary code to drop inventory on hg friends using the profile window...Diva Canto2011-05-242-7/+43
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2011-05-211-2/+1
| |\
| * | HG Friends working to some extent: friendships offered and accepted correctly...Diva Canto2011-05-191-0/+2
* | | Merge branch 'master' into careminster-presence-refactorMelanie2011-05-221-2/+1
|\ \ \ | | |/ | |/|
| * | Get rid of OpenSim.Tests.Common.Setup subpackage in favour of just OpenSim.Te...Justin Clark-Casey (justincc)2011-05-211-1/+0
| * | rename UserProfileTestUtils to UserAccountHelpers to be consistent with other...Justin Clark-Casey (justincc)2011-05-211-1/+1
| |/
| * Remove a spammy debug I left in. Disable TP cancel button at the pointMelanie2011-05-081-1/+2
* | Remove a spammy debug I left in. Disable TP cancel button at the pointMelanie2011-05-081-1/+2
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-05-082-8/+17
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2011-05-082-8/+17
| |\
| | * Mantis #5472Diva Canto2011-05-081-6/+15
| | * Change command help text for "show capabilities" to "show caps", as this is t...Justin Clark-Casey (justincc)2011-05-061-2/+2
| * | Enable compressed (gzip) fatpack transfers.Melanie2011-05-081-0/+1
| |/
* | Enable compressed (gzip) fatpack transfers.Melanie2011-05-081-0/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-05-053-1118/+250
|\ \ | |/
| * Merge branch 'master' into capsDiva Canto2011-05-042-1/+6
| |\
| * | Changed the defaults, so that it behaves exactly is it has been behaving (no ...Diva Canto2011-05-021-0/+2
| * | Broke down Caps.cs into a generic Caps object that simply registers/unregiste...Diva Canto2011-05-011-30/+20
| * | Move CapabilitiesModule back to CoreModules. This one belongs there.Diva Canto2011-05-011-0/+257
| * | First stab at cleaning up Caps. Compiles. Untested.Diva Canto2011-04-302-1118/+0
* | | Merge branch 'master' into careminster-presence-refactorMelanie2011-05-052-4/+13
|\ \ \ | | |/ | |/|
| * | Put the previous state back in the attachments in case the agent transfer fails.Diva Canto2011-05-041-0/+4
| * | Fixes mantis #5461.Diva Canto2011-05-041-1/+2
| |/
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-302-31/+47
|\ \ | |/
| * Remove the scripts of the attachments in the departing region and recreate th...Diva Canto2011-04-291-2/+10
| * Fatpack message on agent transfers: 1 message only (UpdateAgent) containing t...Diva Canto2011-04-282-29/+37
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-211-275/+287
|\ \ | |/
| * refactor: split out the code which actually copies a particular bundle to inv...Justin Clark-Casey (justincc)2011-04-181-106/+115
| * refactor: rename DeleteToInventory() to CopyToInventory()Justin Clark-Casey (justincc)2011-04-181-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-182-17/+49
|\ \ | |/
| * Fix bug where objects were being coalesced in the wrong positions.Justin Clark-Casey (justincc)2011-04-181-2/+2
| * Provide a configuration setting to control whether multiple taken objects are...Justin Clark-Casey (justincc)2011-04-182-15/+47