Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-21 | 1 | -21/+84 |
|\ | |||||
| * | minor: change a comment and replace some magic numbers with the AssetType enum | Justin Clark-Casey (justincc) | 2010-04-19 | 1 | -3/+3 |
| | | |||||
| * | If a transfer request is received for a task inventory item asset, then ↵ | Justin Clark-Casey (justincc) | 2010-04-19 | 1 | -44/+64 |
| | | | | | | | | | | | | | | | | | | route the permissions request through the existing CanEditScript() and CanEditNotecard() methods. This implements the 'share with group' flag for notecards and scripts in prim inventory since the PermissionsModule checks group membership and permissions. Other than that, the code in PermissionsModule duplicates the checks in LLClientView so there should be no change other than allowing group members to edit embedded notecards and scripts. For all other asset types, the permission checking code in LLClientView continues to be used, pending refactoring of suitable permissions code This means that 'share with group' will not yet work for prim inventory items other than notecards and scripts | ||||
| * | log problems when an asset request through the UDP TransferRequest channel ↵ | Justin Clark-Casey (justincc) | 2010-04-19 | 1 | -2/+45 |
| | | | | | | | | goes wrong | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-19 | 1 | -24/+86 |
|\ \ | |/ | |||||
| * | minor: add some documentation around the asset udp request path and replace ↵ | Justin Clark-Casey (justincc) | 2010-04-14 | 1 | -18/+33 |
| | | | | | | | | some magic numbers with libomv enums | ||||
| * | thanks lkalif for Mantis #4676 - a patch that adds support for inventory links | dahlia | 2010-04-12 | 1 | -0/+34 |
| | | | | | | | | Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com> | ||||
| * | * Adds IAssetService.GetCached() to allow asset fetching from the local ↵ | John Hurliman | 2010-04-08 | 1 | -2/+5 |
| | | | | | | | | | | | | | | cache only * Adds GetTextureModule that implements the "GetTexture" capability, aka HTTP texture fetching. This is a significantly optimized path that does not require any server-side JPEG2000 decoding, texture priority queue, or UDP file transfer * Sanity check for null reference in LLClientView.RefreshGroupMembership() | ||||
| * | log exceptions that end up at the top of a asynchronous viewer packet method ↵ | Justin Clark-Casey (justincc) | 2010-04-05 | 1 | -3/+13 |
| | | | | | | | | call rather than swallowing them | ||||
| * | Partially implement share with group option for object inventory items | Justin Clark-Casey (justincc) | 2010-04-05 | 1 | -6/+9 |
| | | | | | | | | | | | | If serverside permissions are off then this works as expected. Previously, it was impossible for more than one person to edit such items even if permissions were off. If serverside permissions are on then this works as expected if the object was created by an avatar who had the required group active. However, if the group for the object is later set then the contained item is still not editable. This may be linked to a wider bug where the object is still not modifiable by the group anyway | ||||
* | | 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! |