aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 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
* | | Merge branch 'master' into careminsterMelanie2012-08-291-2/+34
|\ \ \ | | |/ | |/| | | | | | | | | | 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-291-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.
* | | renaming to be similar to equivalent Set commandMelanie2012-08-251-1/+1
| | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
* | | Merge commit 'a0d178b284050df64d0eb5b9728565fd72615c22' into careminsterMelanie2012-08-255-5/+7
|\ \ \ | |/ /
| * | minor: Fix bad log message for failure to create an inventory folderJustin Clark-Casey (justincc)2012-08-251-1/+1
| | |
| * | Log initial script startup info notice when xengine actually starts to do ↵Justin Clark-Casey (justincc)2012-08-251-1/+1
| | | | | | | | | | | | this for debugging purposes, rather than before it actually starts to do this.
| * | Extend "Restarting scripts in attachments" debug log message to show actual ↵Justin Clark-Casey (justincc)2012-08-241-1/+3
| | | | | | | | | | | | name of user and the region they are in
| * | If a connecting scene presence is replacing an existing scene presence then ↵Justin Clark-Casey (justincc)2012-08-241-1/+1
| | | | | | | | | | | | bypass close checks.
| * | Pass the "attachToBackup" bool given to SceneGraph.AddNewSceneObject() down ↵Justin Clark-Casey (justincc)2012-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | | into the 3-parameter AddNewSceneObject() method instead of always hardcoding true. This doesn't affect any core OpenSimulator code since all callers were passing true anyway But it allows region modules to create objects that are never persisted.
* | | Merge branch 'master' into careminsterMelanie2012-08-241-0/+3
|\ \ \ | |/ /
| * | Fix bad child prim permissions that can make objects change perms after rezzingMelanie2012-08-243-3/+39
| | | | | | | | | | | | Port from Avination
* | | Merge branch 'avination' into careminsterMelanie2012-08-243-3/+39
|\ \ \ | | |/ | |/|
| * | Fix bad child prim permissions that can make objects change perms after rezzingMelanie2012-08-233-3/+39
| | |
* | | Merge branch 'master' into careminsterMelanie2012-08-233-17/+37
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/IClientAPI.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | refactoring out SetFaceColorSignpostMarv2012-08-201-52/+15
| | |
| * | making use of implicit operators and Util.Clip handling of Vector3SignpostMarv2012-08-201-21/+26
| | |
| * | single operation for PRIM_COLORSignpostMarv2012-08-201-0/+49
| | |
| * | fix typoSignpostMarv2012-08-201-1/+1
| | |
| * | Add --force flag to "kick user" console command to allow bypassing of recent ↵Justin Clark-Casey (justincc)2012-08-202-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | race condition checks. This is to allow a second attempt to remove an avatar even if "show connections" shows them as already inactive (i.e. close has already been attempted once). You should only attempt --force if a normal kick fails. This is partly for diagnostics as we have seen some connections occasionally remain on lbsa plaza even if they are registered as inactive. This is not a permanent solution and may not work anyway - the ultimate solution is to stop this problem from happening in the first place.
* | | Merge branch 'avination' into careminsterMelanie2012-08-234-2/+18
|\ \ \ | | |/ | |/|
| * | Make terrain save every 1000 frames instead of every 50. Database load is a ↵Melanie2012-08-221-1/+1
| | | | | | | | | | | | sim killer.
| * | Fix group return stuffMelanie2012-08-211-1/+1
| | |
| * | Cause a persistence save if prim flags changeMelanie2012-08-211-0/+2
| | |
| * | Add Camera Offsets to serializationMelanie2012-08-211-0/+14
| | |
* | | Merge branch 'master' into careminsterMelanie2012-08-185-25/+155
|\ \ \ | |/ / |/| / | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
generated by cgit v1.1 at 2025-01-24 08:08:02 +0000