aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-04-072-12/+13
|\ | | | | | | | | | | | | | | | | 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
| * Store FromItemID for attachments once on SOG instead of on every SOP and ↵Justin Clark-Casey (justincc)2012-04-072-12/+13
| | | | | | | | | | | | only ever using the root part entry. This eliminates some pointless memory use.
* | Merge branch 'master' into careminsterMelanie2012-03-314-157/+238
|\ \ | |/ | | | | | | | | | | | | 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
| * 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-302-50/+73
| | | | | | | | | | | | | | 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-292-49/+23
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
| * Simplify friends caching by only doing this for root agents - no functions ↵Justin Clark-Casey (justincc)2012-03-282-47/+21
| | | | | | | | | | | | | | | | require caching for child agents. This allows us to avoid unnecessary multiple calls to the friends service. All friends functions originate from the root agent and only go to other root agents in existing code. This also allows us to eliminate complex ref counting.
* | Merge branch 'master' into careminsterMelanie2012-03-281-2/+76
|\ \ | |/
| * Add "friends show cache <first-name> <last-name>" command for debugging ↵Justin Clark-Casey (justincc)2012-03-281-2/+76
| | | | | | | | | | | | purposes. This adds a reverse lookup (name -> ID) to IUserManagement instead of hitting the UserAccountService directly.
* | Merge commit 'df624c13c98b06d57311c1d93ecbd4790553f3b3' into careminsterMelanie2012-03-221-7/+10
|\ \ | |/
| * HG Friends: don't notify if the server isn't there.Diva Canto2012-03-221-7/+10
| |
* | Merge branch 'master' into careminsterMelanie2012-03-223-40/+101
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * HG Friends: reroute the status notifications to the HGFriends service, so ↵Diva Canto2012-03-212-7/+26
| | | | | | | | that they can scale better. They were previously being handled by the UAS; that is still there, but it's now obsolete and will be removed in a future release.
| * HG Friends: pulled sim-bound notification code to HGStatusNotifier, so that ↵Diva Canto2012-03-213-20/+58
| | | | | | | | we can better manage this traffic.
| * Removed extraneous debug messageDiva Canto2012-03-211-3/+0
| |
| * Removed extraneous debug messages. Added a check for UUID.Zero.Diva Canto2012-03-201-16/+23
| |
* | Merge branch 'master' into careminsterMelanie2012-03-212-118/+201
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
| * HG Friends: allow the establishment of HG friendships without requiring ↵Diva Canto2012-03-202-119/+202
| | | | | | | | co-presence in the same sim. Using avatar picker, users can now search for names such as "first.last@grid.com:9000", find them, and request friendship. Friendship requests are stored if target user is offline. TESTED ON STANDALONE ONLY.
* | Merge branch 'master' into careminsterMelanie2012-03-181-8/+8
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Clean up "save iar" helpJustin Clark-Casey (justincc)2012-03-171-8/+8
| |
* | Allow RLV to redirect received folders to #RLV folderMelanie2012-03-111-0/+33
| |
* | Merge branch 'master' into careminsterMelanie2012-03-111-2/+3
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs
| * minor: In IAR save, log when we start adding the control file rather than ↵Justin Clark-Casey (justincc)2012-03-101-2/+3
| | | | | | | | saying afterwards that we added it.
* | Merge branch 'master' into careminsterMelanie2012-03-082-4/+4
|\ \ | |/
| * Change "help" to display categories/module list then "help ↵Justin Clark-Casey (justincc)2012-03-082-4/+4
| | | | | | | | | | | | | | | | | | | | | | <category/module>" to display commands in a category. This is to deal with the hundred lines of command splurge when one previously typed "help" Modelled somewhat on the mysql console One can still type help <command> to get per command help at any point. Categories capitalized to avoid conflict with the all-lowercase commands (except for commander system, as of yet). Does not affect command parsing or any other aspects of the console apart from the help system. Backwards compatible with existing modules.
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-03-041-6/+11
|\ \ | | | | | | | | | careminster
| * | Implement llSetKeyframedMotion. No persistence, no region crossing. Yet.Melanie2012-02-261-1/+1
| | |
| * | Delay the sending of the initial werables update until the inventory andMelanie2012-02-251-6/+11
| | | | | | | | | | | | | | | VFS in the viewer are ready. We're much faster than SL and that exposes this race condition. Also reinstate the extra avatar data send on login
* | | Merge branch 'master' into careminsterMelanie2012-03-031-2/+11
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Send the right name and creation date on the BasicProfileModule.Diva Canto2012-03-011-2/+11
| | |
* | | Merge branch 'master' into careminsterMelanie2012-02-251-3/+0
|\ \ \ | |/ / | | / | |/ |/| | | | | Conflicts: 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
| * Remove EXPERIMENTAL tags from load iar/save iar commands.Justin Clark-Casey (justincc)2012-02-251-3/+0
| |
* | Merge branch 'ubitwork'Melanie2012-02-191-1/+1
|\ \ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
| * \ Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-02-151-9/+31
| |\ \
| * | | initial introdution of physics actor building control.UbitUmarov2012-02-081-1/+1
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-02-181-0/+4
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
| * | Added the TriggerAvatarAppearanceChanged to EventManager. It's triggered by ↵Dan Lake2012-02-171-0/+4
| | | | | | | | | | | | AvatarFactoryModule after an avatar's appearance has been succesfully changed and persisted (if the persist option is set).
* | | Merge branch 'master' into careminsterMelanie2012-02-151-9/+31
|\ \ \ | |/ / | | / | |/ |/|
| * Refactor appearance saving for NPC to use AvatarFactoryModule interface.Dan Lake2012-02-141-9/+31
| |
* | Merge branch 'master' into careminsterMelanie2012-02-042-6/+6
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * Changed save oar and save iar parameter -p|--profile to -h|--home, including ↵Snoopy Pfeffer2012-02-032-6/+6
| | | | | | | | corresponding RemoteAdmin parameter
generated by cgit v1.1 at 2024-12-21 05:10:16 +0000