Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | root | 2011-07-09 | 1 | -1/+9 |
|\ | |||||
| * | refactor: rename bool returning GetAgentInventoryItem() to ↵ | Justin Clark-Casey (justincc) | 2011-07-08 | 1 | -1/+9 |
| | | | | | | | | CanGetAgentInventoryItem() to improve code readability | ||||
* | | Merge branch 'master' into careminster-presence-refactor | root | 2011-07-05 | 1 | -0/+40 |
|\ \ | |/ | |||||
| * | Create a very basic initial test which just creates an 'npc' and tests that ↵ | Justin Clark-Casey (justincc) | 2011-07-02 | 1 | -0/+40 |
| | | | | | | | | the scene presence exists | ||||
* | | Merge branch 'master' into careminster-presence-refactor | root | 2011-06-30 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Hack around with the NPC module to get osNpcCreate() partially working again. | Justin Clark-Casey (justincc) | 2011-06-29 | 1 | -1/+1 |
| | | | | | | | | | | | | This now creates an avatar but appearance is always cloudy. Move doesn't work. Really, creating an NPC should only involve a ScenePresence rather than doing anything with IClientAPI, since an NPC has no viewer to communicate with! | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-09 | 3 | -1/+7 |
|\ \ | |/ | |||||
| * | Fixed "Unknown User" listed as creator/owner on prims created with the Build ↵ | Diva Canto | 2011-06-08 | 1 | -0/+1 |
| | | | | | | | | button by foreign visitors. Added command to the UserManagementModule to list all the known bindings between user UUIDs and their names: show user-names. | ||||
| * | HG lures working! Friends can offer friends HG teleports via the profile. ↵ | Diva Canto | 2011-05-27 | 1 | -0/+3 |
| | | | | | | | | WARNING: additional configuration for HG inis -- see *Common.ini.example | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2011-05-26 | 2 | -6/+21 |
| |\ | |||||
| * | | Added necessary code to drop inventory on hg friends using the profile ↵ | Diva Canto | 2011-05-24 | 1 | -0/+2 |
| | | | | | | | | | | | | window, but can't test because this mechanism doesn't seem to work without a profile service. | ||||
| * | | Fixed permissions bug related to friends in PermissionsModule. Added ↵ | Diva Canto | 2011-05-21 | 1 | -1/+1 |
| | | | | | | | | | | | | FriendsData[] GetFriends(string principalID) to IFriendsData and FriendInfo[] GetFriends(string PrincipalID) to IFriendsService. Refactored some more in the FriendsModule. Made client get notification of local friends permissions upon HGLogin. HG Friends object permissions work. | ||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-27 | 1 | -6/+19 |
|\ \ \ | | |/ | |/| | |||||
| * | | Add a --noassets option to "save oar". | Justin Clark-Casey (justincc) | 2011-05-26 | 1 | -6/+19 |
| | | | | | | | | | | | | | | | This switch stops any assets being saved in the oar. This can be useful if you're using OAR to backup regions and you know you'll always have the original asset database available. | ||||
| * | | Create a method to force the script engine to save state from outside | Melanie | 2011-05-24 | 1 | -0/+2 |
| |/ | |||||
* | | Create a method to force the script engine to save state from outside | Melanie | 2011-05-24 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-05 | 2 | -9/+7 |
|\ \ | |/ | |||||
| * | Broke down Caps.cs into a generic Caps object that simply ↵ | Diva Canto | 2011-05-01 | 1 | -9/+5 |
| | | | | | | | | | | | | | | registers/unregisters capabilities and a specific bunch of capability implementations in Linden space called BunchOfCaps. Renamed a few methods that were misnomers. Compiles but doesn't work. | ||||
| * | First stab at cleaning up Caps. Compiles. Untested. | Diva Canto | 2011-04-30 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-21 | 1 | -1/+17 |
|\ \ | |/ | |||||
| * | refactor: rename DeleteToInventory() to CopyToInventory() | Justin Clark-Casey (justincc) | 2011-04-18 | 1 | -1/+17 |
| | | | | | | | | DeleteToInventory() is misleading - it is the caller that decides whether to delete or not | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-06 | 2 | -0/+12 |
|\ \ | |/ | |||||
| * | Make the "All Estates" option work from the client (this makes chosen ↵ | Justin Clark-Casey (justincc) | 2011-04-05 | 2 | -0/+12 |
| | | | | | | | | | | | | | | | | changes to all the estates that the user owns). This applies to adding/removing estate users, groups, managers and bans. This is the application of the AllEstates_0.5.patch from http://opensimulator.org/mantis/view.php?id=5420 Thanks very much, Snoopy! | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-01 | 3 | -223/+1 |
|\ \ | |/ | |||||
| * | Start using IPrimCounts populated by PrimCountModule instead of LandData ↵ | Justin Clark-Casey (justincc) | 2011-03-25 | 3 | -223/+1 |
| | | | | | | | | | | | | | | counts populated by LandManagementModule. In order to pass ILandObject into IClientAPI.SendLandProperties(), had to push ILandObject and IPrimCounts into OpenSim.Framework from OpenSim.Region.Framework.Interfaces, in order to avoid ci Counts are showing odd behaviour at the moment, this will be addressed shortly. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-03-27 | 3 | -2/+123 |
|\ \ | |/ | |||||
| * | Add ILandObject.IPrimCounts for the new prim count module. | Justin Clark-Casey (justincc) | 2011-03-25 | 1 | -0/+5 |
| | | | | | | | | Not functional yet, but tests now act against this object rather than interrogating the module directly | ||||
| * | minor: slightly adjust previous method doc. | Justin Clark-Casey (justincc) | 2011-03-21 | 2 | -2/+2 |
| | | |||||
| * | add method doc to IEstateDataService and IEstateDataStore interfaces | Justin Clark-Casey (justincc) | 2011-03-21 | 2 | -2/+90 |
| | | |||||
| * | On initial region registration, if the user chooses the option to make the ↵ | Justin Clark-Casey (justincc) | 2011-03-21 | 2 | -0/+28 |
| | | | | | | | | region part of an existing estate, then list the existing region names. | ||||
* | | Add some more fields to Estate settings and make them work. | Melanie | 2011-03-22 | 1 | -0/+2 |
| | | | | | | | | | | Run alter table estate_settings add column AllowLandmark tinyint not null default 1, add column AllowParcelChanges tinyint not null default 1, add column AllowSetHome tinyint not null default 1; to make this work. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-16 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Hack in a crude temporary "estate show" command | Justin Clark-Casey (justincc) | 2011-02-12 | 1 | -1/+1 |
| | | | | | | | | | | | | This will show the estate for each region, along with that estate's id and the estate owner. This is temporary because the command output might change. This commit also converts the estate module from the old to the new region module format | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-07 | 1 | -0/+1 |
|\ \ | |/ | |||||
| * | New command: show pending-objects | Diva Canto | 2011-02-06 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-29 | 1 | -0/+55 |
|\ \ | |/ | |||||
| * | Create the structure of classes and interfaces to replace the cruft that | Melanie | 2011-01-29 | 1 | -0/+2 |
| | | | | | | | | is in the land management module today | ||||
| * | Add the prim count interfaces | Melanie | 2011-01-28 | 1 | -0/+53 |
| | | |||||
| * | Fix bumping into sim borders and check estate bans for walking crossings | Melanie | 2011-01-28 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2011-01-28 | 1 | -1/+1 |
|\ \ | | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | | Fix bumping into sim borders and check estate bans for walking crossings | Melanie | 2011-01-28 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-28 | 1 | -0/+1 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Thank you, Goetz, for a patch to fix prim count display in cut regions. | Melanie | 2011-01-28 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-27 | 1 | -0/+8 |
|\ \ | |/ | |||||
| * | When an oar is loaded, do not create a default parcel before loading the ↵ | Justin Clark-Casey (justincc) | 2011-01-27 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | parcels from the OAR. The region spanning parcel shouldn't exist in this situation. If it does, when the land data is loaded it is repersisted with a local ID which comes after the ones loaded via the oar, which obliterates the oar loaded one. Resaving the data we just loaded from the database is somewhat odd in itself (though this makes sense from the way that OAR loading was already using the same event). | ||||
| * | Fix OAR parcel loading so that old parcels are replaced by the new instead ↵ | Justin Clark-Casey (justincc) | 2011-01-27 | 1 | -0/+5 |
| | | | | | | | | | | | | of merged. The --merge switch will still merge the old and new land parcelling. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-27 | 1 | -0/+14 |
|\ \ | |/ | |||||
| * | Add some comments on ILandObject.StartPoint and EndPoint | Justin Clark-Casey (justincc) | 2011-01-26 | 1 | -0/+10 |
| | | |||||
| * | Implement command "land show". This shows all the parcels on the currently ↵ | Justin Clark-Casey (justincc) | 2011-01-26 | 1 | -0/+4 |
| | | | | | | | | | | | | selected region/s This is useful for diagnostics. The command is "land show" rather than "show land" because it's implemented as a module specific subcommand. | ||||
* | | Add an interface for a region's user account cache | Melanie | 2011-01-27 | 1 | -0/+13 |
| | |