Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-03 | 11 | -68/+1448 |
|\ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-10-03 | 1 | -21/+34 |
| |\ | |||||
| | * | Attempt at fixing mantis #5057 -- CPU pinned high with HGAssetBroker. | Diva Canto | 2010-10-02 | 1 | -21/+34 |
| | | | |||||
| * | | Adapt to core changes | Melanie | 2010-10-03 | 1 | -1/+1 |
| | | | |||||
| * | | Addign the new / renamed files for previous commit | Melanie | 2010-10-03 | 8 | -0/+2655 |
| | | | |||||
| * | | Initial port of the Warp3D map tile renderer | Melanie | 2010-10-03 | 6 | -1290/+2 |
| |/ | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-02 | 1 | -12/+0 |
|\ \ | |/ | |||||
| * | Reapplying the parts of the prior revert that were not derived from the | Melanie | 2010-10-02 | 1 | -1/+1 |
| | | | | | | | | original patch | ||||
| * | Revert "Forward-port 0.6 fix" | Melanie | 2010-10-02 | 1 | -13/+1 |
| | | | | | | | | This reverts commit 90b51dc7d67507e27c4baa529e979de19dce8de1. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-30 | 5 | -16/+26 |
|\ \ | |/ | |||||
| * | Prevent dropping someone else's attachments | Melanie | 2010-09-30 | 1 | -0/+3 |
| | | |||||
| * | Forward-port 0.6 fix | Melanie | 2010-09-30 | 1 | -1/+13 |
| | | |||||
| * | Cleanup: Removed an unreferenced variable from ActivityDetector.cs | John Hurliman | 2010-09-29 | 1 | -11/+1 |
| | | |||||
| * | Part two of the previous commit, making IGridUserService.LoggedOut() more ↵ | John Hurliman | 2010-09-29 | 3 | -5/+5 |
| | | | | | | | | flexible without changing current behavior | ||||
| * | Made IGridUserService.SetLastPosition() more flexible to allow different ↵ | John Hurliman | 2010-09-29 | 3 | -6/+11 |
| | | | | | | | | possible implementations. This doesn't change any behavior or any Robust code, but it simplifies the SimianGrid connector by using the standard OpenSim interface for setting last position now | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-27 | 1 | -0/+3 |
|\ \ | |/ | |||||
| * | Restrict top colliders / top scripts to estate managers | Melanie | 2010-09-27 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-27 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Quash the region ID on intersim messages. That prevents people from determining | Melanie | 2010-09-27 | 1 | -1/+1 |
| | | | | | | | | another avatars location | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-26 | 4 | -9/+11 |
|\ \ | |/ | |||||
| * | When receiving intersim IM, don't let the spoof protection bomb | Melanie | 2010-09-26 | 1 | -1/+2 |
| | | |||||
| * | Consistency patch: use Path.Combine() instead of + and eliminate the need | Melanie | 2010-09-26 | 3 | -8/+9 |
| | | | | | | | | for a trailing slash on exports/ | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-25 | 1 | -1/+2 |
|\ \ | |/ | |||||
| * | Prevent spoofing the agent name on text IM | Melanie | 2010-09-25 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-25 | 1 | -1/+4 |
|\ \ | |/ | |||||
| * | Fix a minor economy issue | Melanie | 2010-09-25 | 1 | -1/+4 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-21 | 2 | -9/+25 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-09-21 | 1 | -3/+1 |
| |\ | |||||
| | * | Stop broadcasting non 0/DEBUG ChatTypeEnum.Region messages to all avatars | Justin Clark-Casey (justincc) | 2010-09-18 | 1 | -3/+1 |
| | | | | | | | | | | | | This allows non public/debug region wide messages to be sent to scripts but not be broadast to avatars | ||||
| * | | Fix a typo | Melanie | 2010-09-21 | 1 | -3/+3 |
| | | | |||||
| * | | Refactor script create permission into the perms module | Melanie | 2010-09-21 | 1 | -5/+23 |
| |/ | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-17 | 5 | -30/+10 |
|\ \ | |/ | | | | | | | | | Integrate the next large patch. Don't use this version, it has a ghost avatar issue. Next push will fix it. | ||||
| * | Revert "* Changed 11 calls for session info to the more optimized API method" | root | 2010-09-17 | 2 | -33/+83 |
| | | | | | | | | | | This reverts commit 5dc9ea2f2487804d788b4b80d40d91bd792de4c2. Also makes online indicators and IM more robust | ||||
| * | Changed SceneObjectGroup to store parts with the fast and thread-safe ↵ | John Hurliman | 2010-09-16 | 5 | -29/+8 |
| | | | | | | | | MapAndArray collection | ||||
* | | Revert "* Changed 11 calls for session info to the more optimized API method" | root | 2010-09-17 | 2 | -33/+83 |
| | | | | | | | | | | This reverts commit 5dc9ea2f2487804d788b4b80d40d91bd792de4c2. Also makes online indicators and IM more robust | ||||
* | | Catch a nullref | root | 2010-09-16 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-14 | 3 | -18/+24 |
|\ \ | |/ | |||||
| * | Rename now protected method SetAttachmentInventoryStatus() to ↵ | Justin Clark-Casey (justincc) | 2010-09-13 | 1 | -4/+4 |
| | | | | | | | | ShowAttachInUserInventory() to match ShowDetachInUserInventory() | ||||
| * | Remove IAttachmentsModule.SetAttachmentInventoryStatus() from public interface | Justin Clark-Casey (justincc) | 2010-09-13 | 1 | -5/+13 |
| | | | | | | | | No core module is calling and it makes more sense to call methods such as AttachObject() which attach both to the avatar and update inventory appropriately | ||||
| * | If attachment fails (e.g. because asset wasn't found) then don't try to set ↵ | Justin Clark-Casey (justincc) | 2010-09-13 | 1 | -4/+2 |
| | | | | | | | | | | | | attachment as shown in inventory Doing this results in a null reference exception | ||||
| * | minor: Clean up log messages generated when an item is attached | Justin Clark-Casey (justincc) | 2010-09-13 | 2 | -3/+5 |
| | | |||||
| * | * Fixing length calculations for HTTP texture downloads (the end byte is ↵ | John Hurliman | 2010-09-13 | 1 | -4/+6 |
| | | | | | | | | inclusive in Range: headers) | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-13 | 34 | -494/+458 |
|\ \ | |/ | | | | | | | The modules will need to be updated for this to compile and run again. Please don't use until I do the companion commit to modules later on. | ||||
| * | Formatting cleanup. | Jeff Ames | 2010-09-12 | 26 | -237/+232 |
| | | |||||
| * | First pass at cleaning up thread safety in EntityManager and SceneGraph | John Hurliman | 2010-09-10 | 6 | -7/+8 |
| | | |||||
| * | Over a dozen thread safety fixes in FriendsModule | John Hurliman | 2010-09-09 | 1 | -167/+163 |
| | | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-09-08 | 2 | -6/+10 |
| |\ | |||||
| | * | Made the HG asset and inventory brokers use the Helo service in order to ↵ | Diva Canto | 2010-09-08 | 1 | -6/+9 |
| | | | | | | | | | | | | instantiate the right network connectors. Tested on Robust only. | ||||
| | * | Renamed the Helo server connector to a consistent name. Added this in ↵ | Diva Canto | 2010-09-08 | 1 | -0/+1 |
| | | | | | | | | | | | | connector to both Robust.HG.ini.example and HypergridServiceInConnectorModule. | ||||
| * | | * Changed 11 calls for session info to the more optimized API method | John Hurliman | 2010-09-08 | 2 | -71/+33 |
| |/ |