Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Fix indentation and issues where tabs were used instead of spaces in commit ↵ | Justin Clark-Casey (justincc) | 2012-09-12 | 1 | -7/+8 | |
| | | | | | | | | | | | | 783ee949 | |||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-09-12 | 1 | -1/+1 | |
| |\ \ | ||||||
| | * | | Allow an incoming identifier to be specified for a JsonStore. | Mic Bowman | 2012-09-11 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Documentation of economy-related EventManager events | SignpostMarv | 2012-09-12 | 1 | -0/+21 | |
| |/ / | ||||||
| * | | documentation (OnSceneObjectPartCopy) | SignpostMarv | 2012-09-11 | 1 | -0/+3 | |
| | | | ||||||
| * | | documentation (OnRemovePresence) | SignpostMarv | 2012-09-11 | 1 | -0/+7 | |
| | | | ||||||
| * | | documentation (OnNewPresence) | SignpostMarv | 2012-09-11 | 1 | -0/+7 | |
| | | | ||||||
| * | | documentation (OnClientConnect) | SignpostMarv | 2012-09-11 | 1 | -0/+9 | |
| | | | ||||||
| * | | documentation (OnBackup) | SignpostMarv | 2012-09-11 | 1 | -0/+7 | |
| | | | ||||||
| * | | documentation (OnTerrainTick) | SignpostMarv | 2012-09-11 | 1 | -0/+7 | |
| | | | ||||||
| * | | documentation (OnTerrainTainted) | SignpostMarv | 2012-09-11 | 1 | -0/+7 | |
| | | | ||||||
| * | | documentation (OnClientMovement) | SignpostMarv | 2012-09-11 | 1 | -0/+7 | |
| | | | ||||||
| * | | Documenting some of the events on ↵ | SignpostMarv | 2012-09-11 | 1 | -0/+8 | |
| | | | | | | | | | | | | OpenSim.Region.Framework.Scenes.EventManager (OnFrame) | |||||
* | | | Merge branch 'avination' into careminster | Melanie | 2012-09-10 | 7 | -24/+36 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | One more redundante ParcelProprieties on login | UbitUmarov | 2012-09-07 | 1 | -0/+2 | |
| | | | ||||||
| * | | remove fireandforget call to EnableChildAgents at end on CompleteMovement, | UbitUmarov | 2012-09-07 | 1 | -1/+3 | |
| | | | | | | | | | | | | since this is already on own thread and its at the end of it. | |||||
| * | | Make friend notifies and closing child agents async because both can | Melanie | 2012-09-04 | 1 | -1/+1 | |
| | | | | | | | | | | | | block the heartbeat thread if the sim being contacted is unresponsive | |||||
| * | | Merge branch 'ubitwork' into avination | Melanie | 2012-09-04 | 1 | -1/+2 | |
| |\ \ | ||||||
| | * | | a forgotten file plus minor changes. Imp and SL viewer seem to preserve | UbitUmarov | 2012-09-04 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | flight. FS 4.2.2 does not. | |||||
| * | | | Refactor avatar transfer so that the heavy (UpdateAgent) part is separated into | Melanie | 2012-09-04 | 2 | -3/+3 | |
| | | | | | | | | | | | | | | | | it's own sub-method | |||||
| * | | | Prevent a nullref if SimStatsReporter tries to report on a sim where psysics are | Melanie | 2012-09-03 | 1 | -14/+17 | |
| |/ / | | | | | | | | | | not yet initialized | |||||
| * | | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-08-31 | 1 | -5/+55 | |
| |\ \ | ||||||
| * | | | move keyframemotion.copy from sop.copy to sog.copy, where there is | UbitUmarov | 2012-08-30 | 3 | -4/+8 | |
| | | | | | | | | | | | | | | | | newgroup information avaiable. | |||||
* | | | | Merge branch 'master' into careminster | Melanie | 2012-09-09 | 2 | -0/+39 | |
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| * | | | implementing per-region configuration of limits on the number of prims one ↵ | SignpostMarv | 2012-09-09 | 2 | -0/+29 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | can have in a linkset Applied with changes - patch was based on a repo different from core Signed-off-by: Melanie <melanie@t-data.com> | |||||
| * | | | refactoring to allow Scene.GetLandData to accept Vector3 as an argument. ↵ | SignpostMarv | 2012-09-08 | 1 | -0/+10 | |
| | | | | | | | | | | | | | | | | Note that the prior work on LSL_Vector implicit operators means one does not need to explicitly cast a LSL_Vector to Vector3 | |||||
* | | | | Merge branch 'master' into careminster | Melanie | 2012-09-07 | 3 | -8/+86 | |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Framework/Servers/VersionInfo.cs | |||||
| * | | | If reusing dynamic textures, do not reuse small data length textures that ↵ | Justin Clark-Casey (justincc) | 2012-09-06 | 1 | -3/+54 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fall below current viewer discard level 2 thresholds. Viewer LL 3.3.4 and before sometimes fail to properly redisplay dynamic textures that have a small data length compared to pixel size when pulled from cache. This appears to happen when the data length is smaller than the estimate discard level 2 size the viewer uses when making this GetTexture request. This commit works around this by always regenerating dynamic textures that fall below this threshold rather than reusing them if ReuseDynamicTextures = true This can be controlled by the [Textures] ReuseDynamicLowDataTextures config setting which defaults to false. | |||||
| * | | | adding utility method for getting SceneObjectGroup from scene | SignpostMarv | 2012-09-06 | 1 | -0/+12 | |
| | | | | | | | | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | |||||
| * | | | adding utility method for getting SceneObjectPart from scene | SignpostMarv | 2012-09-06 | 1 | -0/+12 | |
| | | | | | | | | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | |||||
| * | | | formatting | SignpostMarv | 2012-09-04 | 1 | -6/+6 | |
| | | | | ||||||
| * | | | although the attachmentPoint argument is a uint, zero is not a valid ↵ | SignpostMarv | 2012-09-04 | 1 | -1/+4 | |
| | | | | | | | | | | | | | | | | attachment point | |||||
* | | | | Merge branch 'master' into careminster | Melanie | 2012-08-31 | 1 | -0/+29 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | adding support for static method script invocations | SignpostMarv | 2012-08-31 | 1 | -2/+9 | |
| | | | | ||||||
| * | | | adding documentation to script invokation methods | SignpostMarv | 2012-08-31 | 1 | -0/+22 | |
| | | | | ||||||
* | | | | Merge branch 'master' into careminster | Melanie | 2012-08-31 | 1 | -0/+2 | |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||||
| * | | | This partially implements the LSL function to set the response | Mic Bowman | 2012-08-29 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | type for an HTTP request. Since the "official" LSL function limits the use of the response type, it is implemented as osSetContentType with a string for the content mime type and a threat level of high. With this function you should be able to implement rather functional media-on-a-prim application with much less difficulty. | |||||
* | | | | Merge branch 'avination' into careminster | Melanie | 2012-08-31 | 6 | -151/+495 | |
|\ \ \ \ | | |_|/ | |/| | | ||||||
| * | | | Merge branch 'ubitwork' into avination | Melanie | 2012-08-30 | 3 | -35/+38 | |
| |\ \ \ | | | |/ | | |/| | ||||||
| | * | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-08-30 | 1 | -1/+2 | |
| | |\ \ | ||||||
| | * | | | [possible still bad] make use of keyframemotion.copy on sop.copy, replacing | UbitUmarov | 2012-08-30 | 3 | -35/+38 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | fromdata(seralize). for now its called with null group since sop.copy() hasn't usable new group information, so for copied keyframes be fully operational UpdateSceneObject(newgroup) needs to be called on them. | |||||
| * | | | | Sequence inventory descendents requests to reduce inventory server load and | Melanie | 2012-08-30 | 1 | -5/+55 | |
| | |/ / | |/| | | | | | | | | | | movement lag. | |||||
| * | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | Melanie | 2012-08-29 | 5 | -134/+424 | |
| |\ \ \ | | |/ / | ||||||
| | * | | A few more changes to keyframes | UbitUmarov | 2012-08-29 | 3 | -64/+116 | |
| | | | | ||||||
| | * | | [Potentially broken] keyframes changes.. since it's there, use timer for | UbitUmarov | 2012-08-29 | 1 | -115/+165 | |
| | | | | | | | | | | | | | | | | crossing retries and not still another thread, etc... | |||||
| | * | | [possible still very broken] mess around keyframes. timer events | UbitUmarov | 2012-08-28 | 5 | -111/+299 | |
| | | | | | | | | | | | | | | | | threads overlaps, some null objects exceptions, region crossing... | |||||
| * | | | Fix a nullref while object is being created | Melanie | 2012-08-28 | 1 | -1/+2 | |
| |/ / | ||||||
| * | | fix incoerence btw KFM_TRANSLATION and ROTATION LSL constants and internal | UbitUmarov | 2012-08-26 | 1 | -2/+2 | |
| | | | | | | | | | | | | DataFormat enum, using values from the KFM constants | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-08-29 | 2 | -4/+48 | |
|\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs | |||||
| * | | Fix regression introduced in a0d178b2 (Sat Aug 25 02:00:17 2012) where ↵ | Justin Clark-Casey (justincc) | 2012-08-29 | 1 | -2/+34 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | folders with asset type of 'Folder' and 'Unknown' were accidentally treated as system folders. This prevented more than one additional ordinary folder from being created in the base "My Inventory" user folder. Added regression test for this case. Switched tests to use XInventoryService with mostly implemented TestXInventoryDataPlugin rather than InventoryService Disabled TestLoadIarV0_1SameNameCreator() since this has not been working for a very long time (ever since XInventoryService) started being used since it doesnt' preserve creator data in the same way as InventoryService did and so effectively lost the OSPAs. However, nobody noticed/complained about this issue and OSPAs have been superseded by HG like creator information via the --home save oar/iar switch. |