aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * Corrected console help texts for "save iar"Snoopy Pfeffer2012-02-031-2/+2
| |
* | Re-Add the reading of attachment data hat was lost in the mergeMelanie2012-02-021-1/+46
| |
* | Merge branch 'master' into careminsterMelanie2012-02-011-11/+9
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Prevent a changed attachment that has been saved from being saved again.Melanie2012-02-011-0/+1
| |
| * Straighten out some attachment mess. Don't save attachment states for HGMelanie2012-02-011-11/+8
| | | | | | | | | | visitors at all. On Leaving a sim, save only the changed ones. Don't save all scripted stuff when leaving a sim.
* | Merge branch 'master' into careminsterMelanie2012-01-261-2/+2
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Update save oar and save iar help responses to reflect new -h|--homenebadon2012-01-251-2/+2
| | | | | | | | | | switches which replace -p|--profile ie: "save oar --home=http://hg.osgrid.org:80 region.oar"
* | Add some loggingMelanie2012-01-171-0/+41
| |
* | Merge branch 'master' into careminsterMelanie2012-01-121-1/+4
|\ \ | |/
| * If deserializing a scene object fails during IAR load then ignore the object ↵Justin Clark-Casey (justincc)2012-01-111-1/+4
| | | | | | | | rather than halting the IAR load with an exception.
* | Merge branch 'master' into careminsterMelanie2012-01-101-3/+3
|\ \ | |/
| * Add avatar names to appearance log messagesJustin Clark-Casey (justincc)2012-01-101-3/+3
| |
* | Merge branch 'master' into careminsterMelanie2012-01-101-2/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * HG Friends: fixed bug introduced by 571efeddb20f38bb4164074b3c217be5387ca2e0 ↵Diva Canto2012-01-101-2/+2
| | | | | | | | (r/17672)
| * Don't try to save a NPCs attachment states on NPC deleteMelanie2012-01-071-0/+8
| |
* | Don't try to save a NPCs attachment states on NPC deleteMelanie2012-01-071-0/+8
| |
* | Merge branch 'master' into careminsterMelanie2012-01-061-1/+6
|\ \ | |/ | | | | | | Conflicts: OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
| * Improve "app rebake" command to return a better message if no uploaded ↵Justin Clark-Casey (justincc)2012-01-051-1/+6
| | | | | | | | texture ids were available for the rebake request
generated by cgit v1.1 at 2024-12-19 07:47:59 +0000