Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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. | ||||
| * | | | | Merge branch 'master' into presence-refactor | Melanie | 2010-01-04 | 1 | -6/+6 |
| |\ \ \ \ | |||||
| * | | | | | The Library Service is now working. UserProfileCacheService.LibraryRoot is ↵ | Diva Canto | 2010-01-01 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | obsolete. Didn't delete it yet to avoid merge conflicts later -- want to stay out of core as much as possible. | ||||
* | | | | | | Merge branch 'master' into careminster | Melanie | 2010-02-14 | 1 | -21/+21 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Apply last two patches from http://opensimulator.org/mantis/view.php?id=3522 | Justin Clark-Casey (justincc) | 2010-02-12 | 1 | -18/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These patch should allow people using systems that do not have their locale set to En_US or similar to use OpenSim without suffering effects such as being a million miles up in the air on login. The problem was caused by parsing strings without forcing that parse to be En_US (hence different decimal and digit group symbols were causing problems). Thanks very much to VikingErik for doing the legwork on this fix and phacelia for spotting it in the first place. | ||||
| * | | | | | Fix http://opensimulator.org/mantis/view.php?id=4224 | Justin Clark-Casey (justincc) | 2010-02-12 | 1 | -3/+3 |
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This resolves the problem where eyes and hair would turn white on standalone configurations When a client receives body part information, for some insane reason or other it always ends up uploading this back to the server and then immediately re-requesting it. This should have been okay since we stored that asset in cache. However, the standalone asset service connector was not checking this cache properly, so every time the client made the request for the asset it has just loaded it would get a big fat null back in the face, causing it to make clothes and hair white. This bug did not affect grids since they use a different service connector. | ||||
* | | | | | Merge branch 'master' into careminster | Melanie | 2010-02-08 | 1 | -1/+3 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | refactor: chain two ScenePresence constructors together to eliminate common ↵ | Justin Clark-Casey (justincc) | 2010-02-04 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | code. No functional changes | ||||
* | | | | | Prevent empty ObjectProperties packets being sent | Melanie | 2010-01-29 | 1 | -0/+3 |
| | | | | | |||||
* | | | | | Fixes terrain editing. Changes ThrottleOutPacketType to task instead of land. | Revolution | 2010-01-28 | 1 | -1/+1 |
| | | | | |