| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2013-04-22 | 53 | -19182/+20056 |
| |\ | |||||
| | * | Merge branch 'master' into careminster | Melanie | 2013-04-21 | 16 | -18176/+18431 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs bin/OpenMetaverse.StructuredData.XML bin/OpenMetaverse.XML bin/OpenMetaverseTypes.XML | ||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | dahlia | 2013-04-21 | 2 | -3/+3 |
| | | |\ | |||||
| | | | * | Fix spelling | BlueWall | 2013-04-20 | 1 | -2/+2 |
| | | | | | |||||
| | | | * | Small fix to prebuild xml for building with mono tools | BlueWall | 2013-04-20 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Materials persistence via SceneObjectPart.dynAttrs. This appears to work ↵ | dahlia | 2013-04-20 | 1 | -8/+154 |
| | | |/ | | | | | | | | | | across region restarts and taking objects into inventory, but probably will not work across archiving via OAR or IAR as materials texture assets may not be adequately referenced to trigger archiving. | ||||
| | | * | handle PUT verb for RenderMaterials Cap | dahlia | 2013-04-20 | 1 | -1/+5 |
| | | | | |||||
| | | * | RenderMaterials POST Cap now return material entries when invoked with an ↵ | dahlia | 2013-04-19 | 1 | -61/+108 |
| | | | | | | | | | | | | | OSDArray of MaterialIDs | ||||
| | | * | Materials-capable viewers send ImageUpdate packets when updating materials ↵ | dahlia | 2013-04-19 | 1 | -11/+35 |
| | | | | | | | | | | | | | that are normally sent via RenderMaterials CAP. This can cause a race condition for updating TextureEntry fields. Therefore filter any TextureEntry updates so they only update if something actually changed. | ||||
| | | * | remove default parameter value that apparently mono cant handle | dahlia | 2013-04-18 | 1 | -1/+1 |
| | | | | |||||
| | | * | Initial experimental support for materials-capable viewers. This is in a ↵ | dahlia | 2013-04-18 | 2 | -0/+383 |
| | | | | | | | | | | | | | very early stage and this module is disabled by default and should only be used by developers for testing as this module could cause data corruption and/or viewer crashes. No materials are persisted yet. | ||||
| | | * | amend previous commit, a line was left out | dahlia | 2013-04-17 | 1 | -0/+1 |
| | | | | |||||
| | | * | Thanks lkalif for a fix to SendRegionHandshake() which fixes a potential ↵ | dahlia | 2013-04-17 | 1 | -2/+6 |
| | | | | | | | | | | | | | crash with Server-side baking enabled viewers | ||||
| | | * | Allow changes to TextureEntry to propagate to viewers when MaterialID changes | dahlia | 2013-04-17 | 1 | -0/+2 |
| | | | | |||||
| | | * | update libomv to git master which adds support for MaterialID in TextureEntry | dahlia | 2013-04-17 | 11 | -15459/+16598 |
| | | | | |||||
| | * | | Merge branch 'master' into careminster | Melanie | 2013-04-16 | 3 | -8/+14 |
| | |\ \ | | |/ | |||||
| | | * | refactor: Remove IClientNetworkServer.NetworkStop() in favour of existing ↵ | Justin Clark-Casey (justincc) | 2013-04-16 | 3 | -8/+14 |
| | | | | | | | | | | | | | | | | | | | | | | Stop(). This was an undocumented interface which I think was for long defunct region load balancing experiments. Also adds method doc for some IClientNetworkServer methods. | ||||
| | * | | Merge branch 'master' into careminster | Melanie | 2013-04-10 | 34 | -998/+1611 |
| | |\ \ | | |/ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLAssetData.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs | ||||
| | | * | BulletSim: fixing problems with llMoveToTarget. Not all fixed yet. | Robert Adams | 2013-04-09 | 3 | -6/+18 |
| | | | | |||||
| | | * | BulletSim: some formatting changes. | Robert Adams | 2013-04-09 | 1 | -10/+17 |
| | | | | |||||
| | | * | Another algorithm for AngularVerticalAttraction. This one Takes into account ↵ | Vegaslon | 2013-04-09 | 1 | -0/+23 |
| | | | | | | | | | | | | | | | | | | | all rotations before it and makes the corrections more close to the time that sl does. Signed-off-by: Robert Adams <Robert.Adams@intel.com> | ||||
| | | * | BulletSim: add Bullet HACD library invocation. Turned off by default as not | Robert Adams | 2013-04-09 | 7 | -94/+183 |
| | | | | | | | | | | | | | totally debugged. Updated DLLs and SOs with more debugged HACD library code. | ||||
| | | * | BulletSim: fix problem where large sets of mega-regions weren't registering | Robert Adams | 2013-04-09 | 1 | -3/+3 |
| | | | | | | | | | | | | | all the terrain with the base region. | ||||
| | | * | minor: fix mono compiler warning in ScriptsHttpRequests.cs | Justin Clark-Casey (justincc) | 2013-04-10 | 1 | -1/+0 |
| | | | | |||||
| | | * | minor: remove mono compiler warnings in InventoryAccessModule | Justin Clark-Casey (justincc) | 2013-04-10 | 1 | -3/+2 |
| | | | | |||||
| | | * | minor: Make exceptions thrown by MySQLAssetData more consistent. | Justin Clark-Casey (justincc) | 2013-04-10 | 1 | -10/+19 |
| | | | | |||||
| | | * | Comment out rez perms logging I accidentally left in at 7f07023 (Sat Apr 6 ↵ | Justin Clark-Casey (justincc) | 2013-04-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | 02:34:51 2013) | ||||
| | | * | Add more notes to async_call_method relating to UnsafeQueueUserWorkItem | Justin Clark-Casey (justincc) | 2013-04-09 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | UnsafeQueueUserWorkItem is so called because it allows the calling code to escalate its security privileges. However, since we must already trust this code anyway in OpenSimulator this is not an issue. | ||||
| | | * | minor: Log an exception if we aren't able to delete a script state file ↵ | Justin Clark-Casey (justincc) | 2013-04-09 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | rather than simply ignoring it. This should never normally happen but if it does then it can be valuable diagonstic information. | ||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-04-09 | 16 | -828/+1261 |
| | | |\ | |||||
| | | | * | BulletSim: Add dylib for BulletSim and add he who figured out building BulletSim | Robert Adams | 2013-04-08 | 2 | -0/+1 |
| | | | | | | | | | | | | | | | | | on a Mac to the CONTRIBUTORS file. | ||||
| | | | * | fixed bullet config for osx | Jon Cundill | 2013-04-08 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Robert Adams <Robert.Adams@intel.com> | ||||
| | | | * | BulletSim: moving comments around. No functional change. | Robert Adams | 2013-04-08 | 3 | -10/+11 |
| | | | | | |||||
| | | | * | BulletSim: clean up actor code so routines use the same coding pattern. | Robert Adams | 2013-04-08 | 10 | -123/+137 |
| | | | | | | | | | | | | | | | | | Fix a few enabling problems. | ||||
| | | | * | BulletSim: complete movement of physical object action code out of the | Robert Adams | 2013-04-08 | 11 | -636/+1078 |
| | | | | | | | | | | | | | | | | | | | | | physical object and into actors for setForce, setTorque, hover, lock axis and avatar move. | ||||
| | | | * | Optimize the number of Simian calls to get the initial presence | Mic Bowman | 2013-04-07 | 1 | -110/+83 |
| | | | | | | | | | | | | | | | | | | | | | | | | | information for the friends list. This is a pretty big performance improvement on login. Note that you must upgrade simian to incorporate the corresponding GetSessions call. | ||||
| | | * | | If OpenSimulator is writing a PID file and finds the file already present on ↵ | Justin Clark-Casey (justincc) | 2013-04-09 | 1 | -0/+5 |
| | | |/ | | | | | | | | | | | | | | | | startup, logging an error since this is commonly due to an unclean shutdown. Unclean shutdown can cause constantly moving objects to disappear if an OAR has just been loaded and they have not reached persistence time threshold, among other problems. | ||||
| | | * | Fix taking (and rezzing) of coalesced objects in the non-root subregions of ↵ | Justin Clark-Casey (justincc) | 2013-04-06 | 4 | -53/+76 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | megaregions. This fixes the combined bounding box location for regions bigger than 256x256. It also fixes the position on taking coalesced objects in the non-root regions, where position checks are properly done on rez instead. It also fixes the megaregion land channel to return null if the land does not exist, which should probably also be done for the ordinary land channels rather than returning a dummy region. Inspiration from Garmin's commit in http://opensimulator.org/mantis/view.php?id=6595. Thanks! | ||||
| | | * | When rezzing a coalesced object, check adjust position of all components. | Justin Clark-Casey (justincc) | 2013-04-06 | 1 | -20/+27 |
| | | | | |||||
| * | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2013-04-22 | 25 | -253/+557 |
| |\ \ \ | |/ / | |||||
| | * | | Merge branch 'master' into careminster | Melanie | 2013-04-05 | 1 | -1/+1 |
| | |\ \ | | |/ | |||||
| | | * | * In between the fog, a moment of clarity. This fixes mantis 6570 | teravus | 2013-04-04 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge branch 'master' into careminster | Melanie | 2013-04-04 | 1 | -1/+1 |
| | |\ \ | | |/ | |||||
| | | * | Fix XmlRpcAdmin admin_exists_user call so that it actually returns the last ↵ | Justin Clark-Casey (justincc) | 2013-04-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | user login time rather than serializing the DateTime directly which generates a set of unexpected fields. lastlogin return is in unix timestamp format. | ||||
| | * | | Merge commit 'f281a994e8544d95961ef669a0fe14c0cba7f175' into careminster | Melanie | 2013-04-04 | 0 | -0/+0 |
| | |\ \ | | |/ | |||||
| | | * | refactor: Simplify ScriptsHttpRequests.GetNextCompletedRequest to more ↵ | Justin Clark-Casey (justincc) | 2013-04-04 | 1 | -10/+4 |
| | | | | | | | | | | | | | simply iterate through pending requests without unnecessary checks. | ||||
| | | * | Fix bug where outstanding llHTTPRequests for scripts were not being aborted ↵ | Justin Clark-Casey (justincc) | 2013-04-04 | 3 | -32/+76 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | when they were deleted. This was because AsyncCommandManager was handing an item ID to IHttpRequestModule.StopHttpRequest() rather than the expected request ID. This commit also makes the http request asynchronous using BeginGetResponse() rather than doing this by launching a new thread so that we can more safely abort it via HttpWebRequest.Abort() rather than aborting the thread itself. This also renames StopHttpRequest() to StopHttpRequestsForScript() since any outstanding requests are now aborted and/or removed. | ||||
| | * | | Merge commit '94d44142e37a9191162a426f28dd23f40b0cf4aa' into careminster | Melanie | 2013-04-04 | 2 | -14/+3 |
| | |\ \ | | |/ | |||||
| | | * | minor: Stop falsely logging that a teleport was being aborted on client ↵ | Justin Clark-Casey (justincc) | 2013-04-03 | 1 | -3/+1 |
| | | | | | | | | | | | | | logout even when no teleport was active. | ||||
| | | * | Fix minor race condition in SOP.SitTargetOrientationLL where inconsistent ↵ | Justin Clark-Casey (justincc) | 2013-04-03 | 1 | -11/+2 |
| | | | | | | | | | | | | | values could be returned if the sit orientation was changed whilst the property was being fetched. | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |