Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | tabulate "show caps" output for easier readability | Justin Clark-Casey (justincc) | 2011-11-29 | 1 | -5/+10 | |
| | | | ||||||
| | * | Correct mistake in "debug eq" help | Justin Clark-Casey (justincc) | 2011-11-29 | 1 | -1/+1 | |
| | | | ||||||
| | * | Add "debug http" command for currently simple extra debug logging of ↵ | Justin Clark-Casey (justincc) | 2011-11-29 | 2 | -14/+67 | |
| | | | | | | | | | | | | non-event queue inbound http requests to a simulator | |||||
* | | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge | Melanie | 2011-11-28 | 30 | -447/+695 | |
|\ \ \ | |/ / | ||||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-28 | 30 | -447/+695 | |
| |\ \ | | |/ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2011-11-26 | 13 | -205/+133 | |
| | |\ | ||||||
| | | * | When removing an LSL sensor for a script (e.g. through llResetScript() or ↵ | Justin Clark-Casey (justincc) | 2011-11-26 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | state change), don't also remove sensors for other scripts in the same prim. Hopefully fixes http://opensimulator.org/mantis/view.php?id=4448 and http://opensimulator.org/mantis/view.php?id=4452 | |||||
| | | * | minor: formatting changes in Scene.PacketHandlers.cs | Justin Clark-Casey (justincc) | 2011-11-26 | 1 | -5/+5 | |
| | | | | ||||||
| | | * | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2011-11-26 | 1 | -1/+1 | |
| | | | | ||||||
| | | * | Rip out unused Scene.HandleFetchInventoryDescendentsCAPS(). | Justin Clark-Casey (justincc) | 2011-11-26 | 3 | -59/+13 | |
| | | | | | | | | | | | | | | | | This has been handled by WebFetchInvDescHandler.Fetch() for some time. | |||||
| | | * | Use the same web fetch handler for every request from every avatar, since it ↵ | Justin Clark-Casey (justincc) | 2011-11-26 | 1 | -3/+11 | |
| | | | | | | | | | | | | | | | | contains no instance code | |||||
| | | * | Stop locking the requests coming in to WebFetchInvDecHandler. | Justin Clark-Casey (justincc) | 2011-11-26 | 1 | -8/+8 | |
| | | | | | | | | | | | | | | | | There's no technical reason for this as the methods are thread safe. However, it might have served to slow down requests. | |||||
| | | * | Fix config so that you can have both WebFetchInventoryDescendents and ↵ | Justin Clark-Casey (justincc) | 2011-11-25 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | FetchInvnetoryDescendents2 caps active at once | |||||
| | | * | Resolve error where an unknown asset type would cause the fetch inventory ↵ | Justin Clark-Casey (justincc) | 2011-11-25 | 2 | -44/+44 | |
| | | | | | | | | | | | | | | | | | | | | | | | | descendents cap to fail. Introduced just a few commits ago in 0688861 | |||||
| | | * | Implement the FetchInventoryDescendents2 capability using the same code as ↵ | Justin Clark-Casey (justincc) | 2011-11-25 | 2 | -18/+39 | |
| | | | | | | | | | | | | | | | | | | | | | | | | WebFetchInventoryDescendents. Enabling this by setting Cap_FetchInventoryDescendents2 = "localhost" in the [ClientStack.LindenCaps] section of OpenSim.ini downloads inventory via http rather than udp in later viewers. | |||||
| | | * | remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2011-11-25 | 5 | -10/+10 | |
| | | | | ||||||
| | | * | Use the more extensive Utils.AssetTypeToString()/InventoryTypeToString() ↵ | Justin Clark-Casey (justincc) | 2011-11-25 | 3 | -61/+5 | |
| | | | | | | | | | | | | | | | | conversion rather than the arrays in TaskInventoryItem | |||||
| | * | | Add missing property to llGetLinkPrimitiveParams | BlueWall | 2011-11-26 | 2 | -0/+4 | |
| | |/ | ||||||
| | * | Fix WebFetchInventoryDescendents cap to use ↵ | Justin Clark-Casey (justincc) | 2011-11-25 | 2 | -8/+17 | |
| | | | | | | | | | | | | | | | | | | Utils.AssetTypeTostring/InventoryTypeToString to convert types to strings These cover a wider range of types. | |||||
| | * | Adding missing CrossBehaviour.cs file to fix build | Justin Clark-Casey (justincc) | 2011-11-24 | 1 | -0/+169 | |
| | | | ||||||
| | * | Remove bizarre call to PhysicsScene.Simulate(0) in ↵ | Justin Clark-Casey (justincc) | 2011-11-24 | 1 | -4/+2 | |
| | | | | | | | | | | | | | | | | | | Scene.GetNearestAllowedPosition() At least on ODE, this wasn't doing any harm but there wasn't any point to it either | |||||
| | * | On pCampBot, add bot as a property on behaviours instead of passing it in ↵ | Justin Clark-Casey (justincc) | 2011-11-24 | 7 | -56/+115 | |
| | | | | | | | | | | | | every time | |||||
| | * | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2011-11-24 | 1 | -1/+1 | |
| | | | ||||||
| | * | When setting packet level logging via "debug packet", apply to all clients, ↵ | Justin Clark-Casey (justincc) | 2011-11-24 | 2 | -21/+21 | |
| | | | | | | | | | | | | | | | | | | not just root ones. Also adds scene name and client type (root|child) to logged information. | |||||
| | * | comment out a noisy log line I accidentally left in from the last commit | Justin Clark-Casey (justincc) | 2011-11-24 | 1 | -1/+1 | |
| | | | ||||||
| | * | Stop passing a request handler to the initial caps.RegisterHandler in ↵ | Justin Clark-Casey (justincc) | 2011-11-24 | 2 | -161/+165 | |
| | | | | | | | | | | | | | | | | | | EventQueueGetModule since this is immediatley replaced by a poll server handler. This allows us to comment out a bunch of code and simplify the codebase and readability. | |||||
| | * | Add a "debug eq" console command for debugging. | Justin Clark-Casey (justincc) | 2011-11-24 | 1 | -6/+79 | |
| | | | | | | | | | | | | This will log outgoing event queue message names if turned on. | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-11-24 | 2 | -102/+104 | |
| | |\ | ||||||
| | * | | Add disabled CrossBehaviour to pCampBot, which is designed to cross test ↵ | Justin Clark-Casey (justincc) | 2011-11-24 | 5 | -15/+19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | bots between neighbouring regions. Not yet enabled since there is a bug where the initial cross will work but all subsequent movements on the receiving simulator appear to fail. | |||||
* | | | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge | Melanie | 2011-11-24 | 25 | -675/+882 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Merge branch 'master' into bigmerge | Melanie | 2011-11-24 | 25 | -675/+882 | |
| |\ \ \ | | | |/ | | |/| | ||||||
| | * | | Append asset ID to URL for storage requests to allow caching proxies to work ↵ | Dan Lake | 2011-11-23 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | with Simian | |||||
| | * | | Merge branch 'master' of git://opensimulator.org/git/opensim | Dan Lake | 2011-11-23 | 10 | -27/+231 | |
| | |\ \ | | | |/ | ||||||
| | | * | Print out what behaviours are active when pCampBot starts up | Justin Clark-Casey (justincc) | 2011-11-23 | 5 | -12/+42 | |
| | | | | ||||||
| | | * | Add teleport behaviour to pCampBot | Justin Clark-Casey (justincc) | 2011-11-23 | 3 | -1/+77 | |
| | | | | | | | | | | | | | | | | | | | | | | | | This teleports the bot to any other regions +/- 5 on the x or y axis. Quite aggressive at the moment since teleports keep occuring at a 1-10secs random interval. No checking yet to see if teleport was successful. | |||||
| | | * | In pCampbot, change "show status" command to "show bots" | Justin Clark-Casey (justincc) | 2011-11-23 | 1 | -2/+2 | |
| | | | | ||||||
| | | * | Rename Bot.BotManager to Manager | Justin Clark-Casey (justincc) | 2011-11-23 | 1 | -9/+16 | |
| | | | | ||||||
| | | * | get pCampBot to extract nearby and store nearby region information | Justin Clark-Casey (justincc) | 2011-11-23 | 2 | -4/+62 | |
| | | | | ||||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-11-23 | 3 | -3/+30 | |
| | | |\ | ||||||
| | | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2011-11-23 | 11 | -293/+288 | |
| | | | |\ | ||||||
| | | | * | | Shell Environment Variables in config | BlueWall | 2011-11-23 | 3 | -3/+30 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding updated Nini and support to use shell environment variables in OpenSimulator configuration. Nini @ https://github.com/BlueWall/Nini-Dev | |||||
| | | * | | | Change random number generator property name in pCampbot | Justin Clark-Casey (justincc) | 2011-11-23 | 1 | -1/+7 | |
| | | | |/ | | | |/| | ||||||
| | * | | | Line endings | Dan Lake | 2011-11-23 | 1 | -101/+101 | |
| | |/ / | ||||||
| | * | | Log error if we attempt to add/remove an OdeCharacter from the _characters ↵ | Justin Clark-Casey (justincc) | 2011-11-22 | 1 | -23/+33 | |
| | | | | | | | | | | | | | | | | list inappropriately | |||||
| | * | | Stop removing actor from the hash maps in OdeScene.RemoveCharacter() since ↵ | Justin Clark-Casey (justincc) | 2011-11-22 | 1 | -6/+1 | |
| | | | | | | | | | | | | | | | | this is now being down in OdeCharacter.DestroyOdeStructures() | |||||
| | * | | Comment out uncalled OdeScene.UnCombine() | Justin Clark-Casey (justincc) | 2011-11-22 | 2 | -66/+60 | |
| | | | | ||||||
| | * | | Comment out unimplemented and uncalled RegionCombinerModule.UnCombineRegion() | Justin Clark-Casey (justincc) | 2011-11-22 | 1 | -27/+27 | |
| | | | | ||||||
| | * | | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2011-11-22 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Stop an exception being thrown and a teleport/border cross failing if the ↵ | Justin Clark-Casey (justincc) | 2011-11-22 | 5 | -32/+41 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | desintation sim has no active script engines. This involves getting IScene.RequestModuleInterfaces() to return an empty array (as was stated in the method doc) rather than an array containing one null entry. Callers adjusted to stop checking for the list reference being null (which never happened anyway) | |||||
| | * | | slightly simplify OdeScene.Simulate() by removing bool processtaints, since ↵ | Justin Clark-Casey (justincc) | 2011-11-22 | 3 | -141/+128 | |
| | |/ | | | | | | | | | | | | | | | | we can inspect count of taint lists instead. also groups OdeCharacter.CreateOdeStructures() and DestroyOdeStructures() together |