aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Fix some inconsistencies in configurartion: NonPhys primsBlueWall2012-09-181-3/+3
| | | | | | | | | | | | | | | | | | Fix inconsistencies between configuration parameter names and their description names. Changing the configuration parameters for non physical prim size min-max from Nonphys* to NonPhys*. Please update your OpenSim.ini and Regions.ini to reflect these changes.
* | | Merge branch 'master' into careminsterMelanie2012-09-171-0/+3
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
| * | preventing a null reference exception from being thrownSignpostMarv2012-09-171-0/+3
| | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
* | | Merge branch 'avination' into careminsterMelanie2012-09-162-3/+3
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
| * | Wait a bit longer for new scene presences to aid tps into laggy regionsMelanie2012-09-141-1/+1
| | |
| * | Add the option to have variable costing for uploadsMelanie2012-09-111-2/+2
| | |
* | | Merge branch 'master' into careminsterMelanie2012-09-163-13/+145
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Scenes/EventManager.cs
| * | Added unit tests for multi-region OARsOren Hurvitz2012-09-141-1/+5
| | |
| * | Support multi-region OAR filesOren Hurvitz2012-09-141-3/+3
| | | | | | | | | | | | Merged ArchiveWriteRequestPreparation.cs and ArchiveWriteRequestExecution.cs. This simplifies the code, and it's faster to write each scene to the archive as it's found rather than all at once at the end.
| * | Documentation of parcel-related eventsSignpostMarv2012-09-131-0/+44
| | | | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * | Fix indentation and issues where tabs were used instead of spaces in commit ↵Justin Clark-Casey (justincc)2012-09-121-7/+8
| | | | | | | | | | | | 783ee949
| * | Documentation of economy-related EventManager eventsSignpostMarv2012-09-121-0/+21
| | |
| * | documentation (OnSceneObjectPartCopy)SignpostMarv2012-09-111-0/+3
| | |
| * | documentation (OnRemovePresence)SignpostMarv2012-09-111-0/+7
| | |
| * | documentation (OnNewPresence)SignpostMarv2012-09-111-0/+7
| | |
| * | documentation (OnClientConnect)SignpostMarv2012-09-111-0/+9
| | |
| * | documentation (OnBackup)SignpostMarv2012-09-111-0/+7
| | |
| * | documentation (OnTerrainTick)SignpostMarv2012-09-111-0/+7
| | |
| * | documentation (OnTerrainTainted)SignpostMarv2012-09-111-0/+7
| | |
| * | documentation (OnClientMovement)SignpostMarv2012-09-111-0/+7
| | |
| * | Documenting some of the events on ↵SignpostMarv2012-09-111-0/+8
| | | | | | | | | | | | OpenSim.Region.Framework.Scenes.EventManager (OnFrame)
* | | Merge branch 'avination' into careminsterMelanie2012-09-106-22/+34
|\ \ \ | | |/ | |/|
| * | One more redundante ParcelProprieties on loginUbitUmarov2012-09-071-0/+2
| | |
| * | remove fireandforget call to EnableChildAgents at end on CompleteMovement,UbitUmarov2012-09-071-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 canMelanie2012-09-041-1/+1
| | | | | | | | | | | | block the heartbeat thread if the sim being contacted is unresponsive
| * | Merge branch 'ubitwork' into avinationMelanie2012-09-041-1/+2
| |\ \
| | * | a forgotten file plus minor changes. Imp and SL viewer seem to preserveUbitUmarov2012-09-041-1/+2
| | | | | | | | | | | | | | | | flight. FS 4.2.2 does not.
| * | | Refactor avatar transfer so that the heavy (UpdateAgent) part is separated intoMelanie2012-09-041-1/+1
| | | | | | | | | | | | | | | | it's own sub-method
| * | | Prevent a nullref if SimStatsReporter tries to report on a sim where psysics areMelanie2012-09-031-14/+17
| |/ / | | | | | | | | | not yet initialized
| * | Merge branch 'avination' into ubitworkUbitUmarov2012-08-311-5/+55
| |\ \
| * | | move keyframemotion.copy from sop.copy to sog.copy, where there isUbitUmarov2012-08-303-4/+8
| | | | | | | | | | | | | | | | newgroup information avaiable.
* | | | Merge branch 'master' into careminsterMelanie2012-09-092-0/+39
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | | implementing per-region configuration of limits on the number of prims one ↵SignpostMarv2012-09-092-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. ↵SignpostMarv2012-09-081-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 careminsterMelanie2012-09-072-5/+32
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Framework/Servers/VersionInfo.cs
| * | | adding utility method for getting SceneObjectGroup from sceneSignpostMarv2012-09-061-0/+12
| | | | | | | | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * | | adding utility method for getting SceneObjectPart from sceneSignpostMarv2012-09-061-0/+12
| | | | | | | | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * | | formattingSignpostMarv2012-09-041-6/+6
| | | |
| * | | although the attachmentPoint argument is a uint, zero is not a valid ↵SignpostMarv2012-09-041-1/+4
| | | | | | | | | | | | | | | | attachment point
* | | | Merge branch 'avination' into careminsterMelanie2012-08-316-151/+495
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'ubitwork' into avinationMelanie2012-08-303-35/+38
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-08-301-1/+2
| | |\ \
| | * | | [possible still bad] make use of keyframemotion.copy on sop.copy, replacingUbitUmarov2012-08-303-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 andMelanie2012-08-301-5/+55
| | |/ / | |/| | | | | | | | | | movement lag.
| * | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkMelanie2012-08-295-134/+424
| |\ \ \ | | |/ /
| | * | A few more changes to keyframesUbitUmarov2012-08-293-64/+116
| | | |
| | * | [Potentially broken] keyframes changes.. since it's there, use timer forUbitUmarov2012-08-291-115/+165
| | | | | | | | | | | | | | | | crossing retries and not still another thread, etc...
| | * | [possible still very broken] mess around keyframes. timer eventsUbitUmarov2012-08-285-111/+299
| | | | | | | | | | | | | | | | threads overlaps, some null objects exceptions, region crossing...
| * | | Fix a nullref while object is being createdMelanie2012-08-281-1/+2
| |/ /
| * | fix incoerence btw KFM_TRANSLATION and ROTATION LSL constants and internalUbitUmarov2012-08-261-2/+2
| | | | | | | | | | | | DataFormat enum, using values from the KFM constants