aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-04-173-4/+4
|\ | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * refactor: Rename EstateSettings.IsEstateManager() to ↵Justin Clark-Casey (justincc)2012-04-173-4/+4
| | | | | | | | | | | | | | EstateSettings.IsEstateManagerOrOwner() to reflect what it actually does. This makes it consistent with other parts of OpenSimulator that are treating ESTATE_MANAGER and ESTATE_OWNER as different entities. As per opensim-dev mailing list.
* | Merge branch 'master' into careminsterMelanie2012-04-142-82/+129
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
| * Added ability to exclude inventory items or folders when saving IAR files.Kevin Cozens2012-04-132-84/+128
| |
* | Merge branch 'master' into careminsterMelanie2012-04-114-4/+64
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Interfaces/IEstateModule.cs
| * HGFriendsModule: Type casts to fix compile errorSnoopy Pfeffer2012-04-111-1/+1
| |
| * HGFriendsModule: Added optional user level based restriction to send ↵Snoopy Pfeffer2012-04-111-4/+20
| | | | | | | | friendship invitations to foreign users.
| * HGFriendsModule: add the scaffolding for supporting permissions pertaining ↵Diva Canto2012-04-112-2/+32
| | | | | | | | to HG friendships. Snoopy take it from here.
| * New OS scripting functions osSetTerrainTexture and osSetTerrainHeight as ↵Snoopy Pfeffer2012-04-101-2/+13
| | | | | | | | originally proposed in SL Jira (https://jira.secondlife.com/browse/SVC-244).
| * Do not timeout group member cache entry, as long as there are frequent group ↵Snoopy Pfeffer2012-04-101-0/+3
| | | | | | | | membership requests. These are caused by movements within the parcel boundaries.
* | Merge branch 'master' into careminsterMelanie2012-04-0710-149/+275
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-04-063-16/+17
| |\
| | * Rather than having a FromFolderID property on every single prim and only ↵Justin Clark-Casey (justincc)2012-04-071-3/+3
| | | | | | | | | | | | | | | | | | ever using the root prim one, store on SOG instead. This reduces pointless memory usage.
| | * Store FromItemID for attachments once on SOG instead of on every SOP and ↵Justin Clark-Casey (justincc)2012-04-073-13/+14
| | | | | | | | | | | | | | | | | | only ever using the root part entry. This eliminates some pointless memory use.
| * | Moved the inventory manipulation from HGEntityTransferModule to ↵Diva Canto2012-04-063-150/+159
| |/ | | | | | | HGInventoryAccessModule where it belongs. They need to exchange some events, so added those to EventManager. Those events (TeleportStart and TeleportFail) are nice to have anyway.
| * Deleted the unused and commented code from 2 commits ago.Diva Canto2012-04-061-241/+1
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-04-061-2/+47
| |\
| | * Revert last commitSnoopy Pfeffer2012-04-051-22/+25
| | |
| | * Group based access restrictions to parcels require group membership, but not ↵Snoopy Pfeffer2012-04-051-25/+22
| | | | | | | | | | | | that this group is active for that user.
| | * Little bug fix in HasGroupAccess, to properly store the case "true" in the ↵Snoopy Pfeffer2012-04-051-5/+2
| | | | | | | | | | | | cache.
| | * Simplify group access checks and break them out into a separate method.Melanie2012-04-051-57/+49
| | | | | | | | | | | | | | | | | | | | | Use existing cache if the avatar is within the region and use an ExpiringCache to cache status if the avatar is not in the region. The 30 second delay now applies to scripted objects ony and only when the owner is not present.
| * | WARNING: LOTS OF COMMENTED AND UNUSED CODE IN THIS COMMIT. This is on ↵Diva Canto2012-04-061-21/+295
| | | | | | | | | | | | purpose; it's an historical record of what works and what doesn't wrt manipulating inventory at the viewer. I'll remove the unused code in a subsequent commit, but wanted to place it in history. The uncommented code works.
| * | Finish the implementation of GetUserInventory, even though it's still not used.Diva Canto2012-04-063-12/+97
| | |
* | | Remove some unneeded parensMelanie2012-04-041-1/+1
| | |
* | | Adjust Snoopy's contribution for AVNMelanie2012-04-051-56/+14
| | |
* | | Merge branch 'master' into careminsterMelanie2012-04-041-1/+57
|\ \ \ | | |/ | |/|
| * | Implements group based access restrictions for parcels of land. Because of ↵Snoopy Pfeffer2012-04-051-1/+57
| |/ | | | | | | caching there can be a delay of up to 30 seconds until the access rights are effectively changed for a user.
* | Merge branch 'master' into careminsterMelanie2012-04-0312-5/+78
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * terrain save-tile extensions Signed-off-by: Garmin Kawaguichi ↵Garmin Kawaguichi2012-04-0311-3/+74
| | | | | | | | | | | | <garmin.kawaguichi@magalaxie.com> Signed-off-by: Melanie <melanie@t-data.com>
| * Eliminate race condition where many callers would check SOP.PhysicsActor != ↵Justin Clark-Casey (justincc)2012-04-031-4/+4
| | | | | | | | | | | | | | | | null then assume it was still not null in later code. Another thread could come and turn off physics for a part (null PhysicsActor) at any point. Had to turn off localCopy on warp3D CoreModules section in prebuild.xml since on current nant this copies all DLLs in bin/ which can be a very large number with compiled DLLs No obvious reason for doing that copy - nothing else does it.
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-03-312-16/+33
|\ \ | | | | | | | | | careminster
| * | Cache the last maptile and return the cachrd tile if the last request isMelanie2012-03-291-8/+22
| | | | | | | | | | | | less than an hour ago. Avoids generating the maptile twice on startup.
| * | Allow the map tile module to be enabled without also eabling refreshMelanie2012-03-291-8/+11
| | |
* | | Merge branch 'master' into careminsterMelanie2012-03-319-171/+271
|\ \ \ | |/ / |/| / | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Tests/Common/Mock/TestClient.cs
| * refactor: Rename SOG.GetChildPart() to GetPart() since it can also return ↵Justin Clark-Casey (justincc)2012-03-311-1/+1
| | | | | | | | the 'root' part.
| * Allow llRegionSayTo() to work on the PUBLIC_CHANNEL, as per ↵Justin Clark-Casey (justincc)2012-03-311-1/+1
| | | | | | | | | | | | http://wiki.secondlife.com/wiki/LlRegionSayTo Addresses http://opensimulator.org/mantis/view.php?id=5950
| * minor: small message adjustment and unnecessary code elimination when ↵Justin Clark-Casey (justincc)2012-03-311-1/+1
| | | | | | | | notifying client of no build permission
| * fix Infinite loading on No Rez http://opensimulator.org/mantis/view.php?id=5932PixelTomsen2012-03-311-0/+5
| |
| * Make default "show friends" console command show friends fetched from the ↵Justin Clark-Casey (justincc)2012-03-302-4/+3
| | | | | | | | | | | | friends service. There is no a --cache option which will show friends from the local cache if available.
| * refactor: Move "friends show cache" console command out into separate ↵Justin Clark-Casey (justincc)2012-03-302-93/+19
| | | | | | | | | | | | FriendsCommandsModule. Expose required methods on IFriendsModule. Rename GetFriends() -> GetFriendsFromCache() for self-documentation
| * Add simple login test with online friends. Add IFriendsModule.GrantRights() ↵Justin Clark-Casey (justincc)2012-03-304-62/+80
| | | | | | | | | | | | | | for granting rights via a module call. Rename IFriendsModule.GetFriendPerms() -> GetRightsGrantedByFriend() to be more self-documenting and consistent with friends module terminology. Add some method doc.
| * refactor: Stop passing both IClientAPI and agentID to friend event ↵Justin Clark-Casey (justincc)2012-03-293-20/+52
| | | | | | | | listeners, these are redundant. Replace a few magic numbers with FriendRights enum already used elsewhere.
| * Add simple regression test for logging in with offline friends. Don't ↵Justin Clark-Casey (justincc)2012-03-291-1/+46
| | | | | | | | expect to receive any in this instance.
| * Add back parts of reverted changes that were not concerned with child agent ↵Justin Clark-Casey (justincc)2012-03-291-0/+3
| | | | | | | | | | | | | | caching. This adds ScenePresence to IClientAPI.SceneAgent earlier on in the add client process so that its information is available to EventManager.OnNewClient() and OnClientLogin() Also add a code comment as to why we're caching friend information for child agents.
| * Change namespace on CallingCardModule and correct interface file placemant. ↵Melanie2012-03-291-2/+29
| | | | | | | | Also ass OpenSource header
| * Revert "Simplify friends caching by only doing this for root agents - no ↵Justin Clark-Casey (justincc)2012-03-292-21/+47
| | | | | | | | | | | | | | | | functions require caching for child agents." We need to cache child agents so that friends object edit/delete permissions will work across boarders on regions hosted by different simulators. This reverts commit d9f7b8549b3cb9699eb8bd54242d31aac0f8241a.
| * Committing the Avination calling card moduleMelanie2012-03-291-0/+286
| |
| * Pushing the Avination Calling card hooks. Module to follow.Melanie2012-03-291-4/+17
| |
* | Committing the Avination calling card moduleMelanie2012-03-281-0/+286
| |
* | Merge branch 'master' into careminsterMelanie2012-03-293-56/+85
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
generated by cgit v1.1 at 2024-12-25 14:11:20 +0000