| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2012-03-28 | 1 | -2/+76 |
| |\ | |||||
| | * | Add "friends show cache <first-name> <last-name>" command for debugging ↵ | Justin Clark-Casey (justincc) | 2012-03-28 | 1 | -2/+76 |
| | | | | | | | | | | | | | purposes. This adds a reverse lookup (name -> ID) to IUserManagement instead of hitting the UserAccountService directly. | ||||
| * | | Merge commit 'df624c13c98b06d57311c1d93ecbd4790553f3b3' into careminster | Melanie | 2012-03-22 | 1 | -7/+10 |
| |\ \ | |/ | |||||
| | * | HG Friends: don't notify if the server isn't there. | Diva Canto | 2012-03-22 | 1 | -7/+10 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-22 | 3 | -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 Canto | 2012-03-21 | 2 | -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 Canto | 2012-03-21 | 3 | -20/+58 |
| | | | | | | | | | we can better manage this traffic. | ||||
| | * | Removed extraneous debug message | Diva Canto | 2012-03-21 | 1 | -3/+0 |
| | | | |||||
| | * | Removed extraneous debug messages. Added a check for UUID.Zero. | Diva Canto | 2012-03-20 | 1 | -16/+23 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-21 | 2 | -118/+201 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | ||||
| | * | HG Friends: allow the establishment of HG friendships without requiring ↵ | Diva Canto | 2012-03-20 | 2 | -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 careminster | Melanie | 2012-03-18 | 1 | -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" help | Justin Clark-Casey (justincc) | 2012-03-17 | 1 | -8/+8 |
| | | | |||||
| * | | Allow RLV to redirect received folders to #RLV folder | Melanie | 2012-03-11 | 1 | -0/+33 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-11 | 1 | -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-10 | 1 | -2/+3 |
| | | | | | | | | | saying afterwards that we added it. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-08 | 2 | -4/+4 |
| |\ \ | |/ | |||||
| | * | Change "help" to display categories/module list then "help ↵ | Justin Clark-Casey (justincc) | 2012-03-08 | 2 | -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 ↵ | Melanie | 2012-03-04 | 1 | -6/+11 |
| |\ \ | | | | | | | | | | careminster | ||||
| | * | | Implement llSetKeyframedMotion. No persistence, no region crossing. Yet. | Melanie | 2012-02-26 | 1 | -1/+1 |
| | | | | |||||
| | * | | Delay the sending of the initial werables update until the inventory and | Melanie | 2012-02-25 | 1 | -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 careminster | Melanie | 2012-03-03 | 1 | -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 Canto | 2012-03-01 | 1 | -2/+11 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-02-25 | 1 | -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-25 | 1 | -3/+0 |
| | | | |||||
| * | | Merge branch 'ubitwork' | Melanie | 2012-02-19 | 1 | -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 ubitwork | UbitUmarov | 2012-02-15 | 1 | -9/+31 |
| | |\ \ | |||||
| | * | | | initial introdution of physics actor building control. | UbitUmarov | 2012-02-08 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-02-18 | 1 | -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 Lake | 2012-02-17 | 1 | -0/+4 |
| | | | | | | | | | | | | | AvatarFactoryModule after an avatar's appearance has been succesfully changed and persisted (if the persist option is set). | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-02-15 | 1 | -9/+31 |
| |\ \ \ | |/ / | | / | |/ |/| | |||||
| | * | Refactor appearance saving for NPC to use AvatarFactoryModule interface. | Dan Lake | 2012-02-14 | 1 | -9/+31 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-02-04 | 2 | -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 Pfeffer | 2012-02-03 | 2 | -6/+6 |
| | | | | | | | | | corresponding RemoteAdmin parameter | ||||
| | * | Corrected console help texts for "save iar" | Snoopy Pfeffer | 2012-02-03 | 1 | -2/+2 |
| | | | |||||
| * | | Re-Add the reading of attachment data hat was lost in the merge | Melanie | 2012-02-02 | 1 | -1/+46 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-02-01 | 1 | -11/+9 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | ||||
| | * | Prevent a changed attachment that has been saved from being saved again. | Melanie | 2012-02-01 | 1 | -0/+1 |
| | | | |||||
| | * | Straighten out some attachment mess. Don't save attachment states for HG | Melanie | 2012-02-01 | 1 | -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 careminster | Melanie | 2012-01-26 | 1 | -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|--home | nebadon | 2012-01-25 | 1 | -2/+2 |
| | | | | | | | | | | | switches which replace -p|--profile ie: "save oar --home=http://hg.osgrid.org:80 region.oar" | ||||
| * | | Add some logging | Melanie | 2012-01-17 | 1 | -0/+41 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-01-12 | 1 | -1/+4 |
| |\ \ | |/ | |||||
| | * | If deserializing a scene object fails during IAR load then ignore the object ↵ | Justin Clark-Casey (justincc) | 2012-01-11 | 1 | -1/+4 |
| | | | | | | | | | rather than halting the IAR load with an exception. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-01-10 | 1 | -3/+3 |
| |\ \ | |/ | |||||
| | * | Add avatar names to appearance log messages | Justin Clark-Casey (justincc) | 2012-01-10 | 1 | -3/+3 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-01-10 | 1 | -2/+2 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | HG Friends: fixed bug introduced by 571efeddb20f38bb4164074b3c217be5387ca2e0 ↵ | Diva Canto | 2012-01-10 | 1 | -2/+2 |
| | | | | | | | | | (r/17672) | ||||
| | * | Don't try to save a NPCs attachment states on NPC delete | Melanie | 2012-01-07 | 1 | -0/+8 |
| | | | |||||
| * | | Don't try to save a NPCs attachment states on NPC delete | Melanie | 2012-01-07 | 1 | -0/+8 |
| | | | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |