aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * fixing bug that get/set the wrong property for prim types other than sphere ↵SignpostMarv2012-08-171-1/+2
| | | | | | | | & box
| * implementedSignpostMarv2012-08-171-0/+50
| |
| * BulletSim: Properly regenerate hulls when objects made physical.Robert Adams2012-08-171-8/+8
| | | | | | | | | | This fixes the problem of non-base shapes (cubes and spheres) falling through the terrain.
| * Modify order of code so SOP doesn't set the physics actor flyingRobert Adams2012-08-171-7/+12
| | | | | | | | | | | | property multiple times every time Update is called. This eliminates zillions of settings which is better for BulletSim. The should be no functionality change.
| * Correct an exception report in SceneObjectPart so it outputs the stack.Robert Adams2012-08-151-1/+1
| |
| * enables configurable minimum sizes for physical & non-physical primsSignpostMarv2012-08-154-20/+93
| |
| * Add support for the extra params to scene and the event managerMelanie2012-08-152-0/+62
| |
| * Add a skeleton for a name value storage associated with regionsMelanie2012-08-151-0/+4
| |
* | Remove AreUpdatesSuspended flag because it does nothingMelanie2012-08-162-24/+0
| |
* | Change case of areUpdatesSuspended to upper case as is proper for a propertyMelanie2012-08-162-8/+8
| |
* | Add support for the extra params to scene and the event managerMelanie2012-08-152-0/+62
| |
* | Add a skeleton for a name value storage associated with regionsMelanie2012-08-151-0/+4
| |
* | Merge branch 'careminster' into avinationMelanie2012-08-142-3/+10
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
| * \ Merge branch 'master' into careminsterMelanie2012-08-141-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * Lay some groundwork for temp attachments. Decouple attachments from inventory.Melanie2012-08-141-1/+1
| | |
| * | Merge branch 'master' into careminsterMelanie2012-08-042-2/+9
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| | * Restore SOG constructor chaining removed in recent 513b77b. This is not a ↵Justin Clark-Casey (justincc)2012-08-031-1/+1
| | | | | | | | | | | | functional change.
| | * Move previously unadvertised SendPeriodicAppearanceUpdates setting from ↵Justin Clark-Casey (justincc)2012-08-031-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Startup] to [Appearance] config section. Add description and default of false (as before) to OpenSimDefaults.ini If set to true, this config switch will resend avatar appearance information (a small amount of UUID data, not the baked textures themselves) to other avatars in the sim every 60 seconds. For me, this has helped with situations where avatars appear persistently grey - the LL viewer sometimes did not appear to request assets the first time the appearance data was sent. However, this switch will not help with other appearance failure situations (e.g. failure to bake assets). This setting is experimental but will not have any significant impact on the simulator if turned to true.
* | | Merge branch 'ubitwork' into avinationMelanie2012-08-031-0/+7
|\ \ \
| * | | on presence close(), release animator and OnRegionHeartbeatEnd eventUbitUmarov2012-08-031-0/+7
| | | |
* | | | Merge branch 'careminster' into avinationMelanie2012-08-033-2/+13
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'master' into careminsterMelanie2012-08-033-2/+13
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| | * | refactor: rename SOG.RezzingObjectID to SOG.FromPartID to match ↵Justin Clark-Casey (justincc)2012-08-032-2/+2
| | | | | | | | | | | | | | | | FromFolderID, FromItemID and to reflect that it's a SOP ID rather than a SOG ID.
| | * | Don't bothre setting RezzingObjectID to UUID.Zero in SOG constructor - this ↵Justin Clark-Casey (justincc)2012-08-031-3/+4
| | | | | | | | | | | | | | | | is already its default value as it's a struct.
| | * | ImprovedTerseObjectUpdate packet does not support shape updates, thus ↵SignpostMarv2012-08-031-1/+1
| | | | | | | | | | | | | | | | scheduling terse updates will not (and does not) update shape information in the viewer
| | * | Initialize the Rezzing object to UUID.ZeroMelanie2012-08-021-3/+4
| | | |
| | * | reduced-complexity implementation of function to get rezzing object keySignpostMarv2012-08-022-1/+10
| | | | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>