Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'careminster' into careminster-presence-refactor | Melanie | 2010-04-13 | 1 | -3/+6 |
|\ | |||||
| * | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-04-13 | 1 | -2/+5 |
| |\ | |||||
| | * | Backported GetTextureModule and IAssetService.GetCached() | John Hurliman | 2010-04-08 | 1 | -2/+5 |
| | | | |||||
| * | | Fix llDialog responses so that they can be heard throughout the region. This ↵ | Thomas Grimshaw | 2010-04-07 | 1 | -1/+1 |
| | | | | | | | | | | | | now conforms to the behaviour in SL. ( http://bugs.meta7.com/view.php?id=13 ) | ||||
| * | | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-03-06 | 1 | -4848/+59 |
| |\ \ | | |/ | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-05 | 1 | -15/+20 |
|\ \ \ | |||||
| * | | | Don't append ACKs to zerocoded packets. Although this should fine in theory, ↵ | John Hurliman | 2010-04-02 | 1 | -15/+20 |
| | | | | | | | | | | | | | | | | I'm seeing the viewer ignore or fail to parse ACKs appended to our zerocoded packets. This should cut down on viewer->sim resend traffic | ||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-31 | 1 | -0/+1 |
|\ \ \ \ | |/ / / | | | | | | | | | Remerge the LightShare bits that were pushed to core | ||||
| * | | | Committing the LightShare code, which was developed by TomMeta of Meta7. | Melanie | 2010-03-31 | 1 | -3/+4 |
| | | | | | | | | | | | | | | | | | | | | This allows scripts to set WindLight parameters for clients connecting to a region. Currently, this is only supported by the Meta7 viewer. | ||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-30 | 2 | -10/+46 |
|\ \ \ \ | |/ / / | |||||
| * | | | minor: commented out code removal | Justin Clark-Casey (justincc) | 2010-03-30 | 1 | -1/+0 |
| | | | | |||||
| * | | | Completely prevent full update packets being sent after kill object packets | Justin Clark-Casey (justincc) | 2010-03-30 | 1 | -6/+43 |
| | | | | | | | | | | | | | | | | | | | | If a full update is sent after the kill, the object remains as in the linden viewer but in an undeletable and unowned state until relog This patch prevents this by recording kills in LLClientView | ||||
| * | | | minor: Print out port that http servers are using | Justin Clark-Casey (justincc) | 2010-03-25 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | do this in callers so that we know who is setting up these things | ||||
| * | | | Renamed TryGetAvatar to TryGetScenePresence on SceneManager, SceneBase, ↵ | Dan Lake | 2010-03-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Scene and SceneGraph. This was the only change in this patch to keep it isolated from other recent changes to the same set of files. | ||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-18 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Removed the unused use_async_when_possible config variable | John Hurliman | 2010-03-16 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-09 | 1 | -0/+20 |
|\ \ \ \ | |/ / / | |||||
| * | | | - parcel blocking, region crossing blocking, teleport blocking | unknown | 2010-03-09 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
| * | | | - supporting llTextBox | unknown | 2010-03-06 | 1 | -0/+20 |
| | | | | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | | | - parcel blocking, region crossing blocking, teleport blocking | unknown | 2010-03-09 | 1 | -0/+4 |
| | | | | |||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-06 | 1 | -11/+24 |
|\ \ \ \ | |/ / / | |||||
| * | | | * Cache packed throttle data to avoid repeated allocations in ↵ | John Hurliman | 2010-03-05 | 1 | -11/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | CheckForSignificantMovement() * Removed a lock on "return m_neighbours.Count" in GetInaccurateNeighborCount(). Dictionary<>.Count by itself does not benefit from locking | ||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-04 | 1 | -3/+13 |
|\ \ \ \ | |/ / / | |||||
| * | | | remove references to OpenSim.Framework.Commuications.Tests.dll since all ↵ | Justin Clark-Casey (justincc) | 2010-03-03 | 1 | -3/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | relevant test code has been obsoleted this allows the tests to pass on my local system | ||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-03 | 5 | -4873/+111 |
|\ \ \ \ | |/ / / | | / / | |/ / |/| | | This brings careminster on the level of master. To be tested | ||||
| * | | Change the signature of SendChangeUserRights, because we have to send | Melanie | 2010-02-28 | 1 | -2/+2 |
| | | | | | | | | | | | | this to both parties | ||||
| * | | Add missing ChangeUserRights packet sender | Melanie | 2010-02-28 | 1 | -0/+15 |
| | | | |||||
| * | | Initial Online friends notification seems to be working reliably now. All ↵ | Diva Canto | 2010-02-28 | 1 | -3/+3 |
| | | | | | | | | | | | | this needs more testing, but everything is there. | ||||
| * | | Streamlined error logging for malformed packets and fixed a bug when ↵ | John Hurliman | 2010-02-23 | 1 | -4/+3 |
| | | | | | | | | | | | | printing the hex dump | ||||
| * | | Changed asset CreatorID to a string | John Hurliman | 2010-02-22 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim ↵ | John Hurliman | 2010-02-22 | 1 | -4847/+4 |
| |\ \ | | | | | | | | | | | | | into presence-refactor | ||||
| | * \ | Merge branch 'master' into presence-refactor | Melanie | 2010-02-22 | 1 | -4847/+4 |
| | |\ \ | | | |/ | | | | | | | | | This brings presence-refactor up to master again | ||||
| | | * | minor: Make FlotsamAssetCache default loglevel 0 to match that given in ↵ | Justin Clark-Casey (justincc) | 2010-02-19 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | bin/config-include/FlotsamCache.ini.example | ||||
| | | * | remove old commented out switch statement in LLClientView since this has ↵ | Justin Clark-Casey (justincc) | 2010-02-17 | 1 | -4845/+2 |
| | | | | | | | | | | | | | | | | successfully been split into separate methods for quite some time now | ||||
| | | * | Formatting cleanup. | Jeff Ames | 2010-02-15 | 1 | -1/+1 |
| | | | | |||||
| * | | | * Adds CreatorID to asset metadata. This is just the plumbing to support ↵ | John Hurliman | 2010-02-22 | 1 | -1/+3 |
| |/ / | | | | | | | | | | CreatorID, it doesn't modify database backends or OAR files to support storing/loading it | ||||
| * | | * Added a sanity check for missing asset data in LLClientView | John Hurliman | 2010-02-20 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | * Moved the SL asset type to content type conversion methods from ServerUtils to OpenSim.Framework.SLUtil * Linked content type to asset type in AssetMetadata | ||||
| * | | Merge branch 'master' into presence-refactor | Melanie | 2010-02-15 | 1 | -22/+76 |
| |\ \ | | |/ | |||||
| | * | Revolution is on the roll again! :) | Revolution | 2010-02-14 | 1 | -1/+55 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes: Undo, T-pose of others on login, modifiedBulletX works again, feet now stand on the ground instead of in the ground, adds checks to CombatModule. Adds: Redo, Land Undo, checks to agentUpdate (so one can not fall off of a region), more vehicle parts. Finishes almost all of LSL (1 function left, 2 events). Direct flames and kudos to Revolution, please Signed-off-by: Melanie <melanie@t-data.com> | ||||
| * | | Merge branch 'master' into presence-refactor | Melanie | 2010-02-08 | 1 | -3/+23 |
| |\ \ | | | | | | | | | | | | | | | | | This was a large, heavily conflicted merge and things MAY have got broken. Please check! | ||||
| * | | | * HGScene is no more. | Diva Canto | 2010-01-30 | 2 | -2/+0 |
| | | | | | | | | | | | | | | | | * Moved a few key inventory access methods from Scene.Inventory to an IInventoryAccessModule module | ||||
| * | | | * HGGridConnector is no longer necessary. | Diva Canto | 2010-01-29 | 2 | -0/+10 |
| | | | | | | | | | | | | | | | | * Handle logout properly. This needed an addition to IClientAPI, because of how the logout packet is currently being handled -- the agent is being removed from the scene before the different event handlers are executed, which is broken. | ||||
| * | | | HG 1.5 is in place. Tested in standalone only. | Diva Canto | 2010-01-28 | 1 | -20/+0 |
| | | | | |||||
| * | | | Go Home works. With security!! | Diva Canto | 2010-01-18 | 1 | -0/+20 |
| | | | | |||||
| * | | | Merge branch 'master' into presence-refactor | Melanie | 2010-01-16 | 1 | -73/+88 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | This merge was very conflicted. I think I got them all, but I can't be sure. I had to merge to master or risk divergence to the point of unmergeability. | ||||
| * | | | | Fixed a couple of bugs with Appearance. Appearance is all good now. | Diva Canto | 2010-01-11 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | OpenSim/Framework/Communications/Cache deleted. LibraryRootFolder deleted. | Diva Canto | 2010-01-11 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | CommunicationsManager deleted. | Diva Canto | 2010-01-11 | 1 | -7/+0 |
| | | | | | |||||
| * | | | | Refactor. Move MainServer init to a place with greener grass | Melanie | 2010-01-11 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Remove all references to master avatar, replacing with estate owner where | Melanie | 2010-01-10 | 1 | -6/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | appropriate. This changes the behavior of the REST plugins and RemoteAdmin's region creation process. |