aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-10-181-0/+9
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-10-182-37/+18
| |\
| | * Remove extraneous calls to the now commented CheckSculptAndLoadMelanie2012-10-181-24/+0
| | |
| | * extend coment to include all unused SOG CheckSculptAndLoad()UbitUmarov2012-10-181-3/+4
| | |
| | * [DANGER UNTESTED] ODE mesh assets. Other plugins will not do meshs/sculptsUbitUmarov2012-10-182-14/+18
| | | | | | | | | | | | | | | | | | now Signed-off-by: Melanie <melanie@t-data.com>
| * | Add number of inventory items to information displayed via "show part" ↵Justin Clark-Casey (justincc)2012-10-181-0/+9
| |/ | | | | | | console command
* | Merge branch 'avination' into careminsterMelanie2012-10-183-23/+36
|\ \ | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/Physics/OdePlugin/OdeScene.cs
| * \ Merge branch 'ubitwork' into avinationMelanie2012-10-173-23/+36
| |\ \
| | * | normalize quaternion.Slerp outputsUbitUmarov2012-10-102-0/+2
| | | |
| | * | bug fix + make costs visible for testingUbitUmarov2012-10-071-4/+9
| | | |
| | * | [DANGER UNTESTED] ODE mesh assets. Other plugins will not do meshs/sculptsUbitUmarov2012-10-072-19/+23
| | | | | | | | | | | | | | | | now
| | * | Merge branch 'avination' into ubitworkUbitUmarov2012-10-052-16/+29
| | |\ \
| | * | | meshworker basic replacement of SOP CheckSculptAndLoad ( for now disabledUbitUmarov2012-10-031-0/+2
| | | | | | | | | | | | | | | | | | | | for all physics engines)
* | | | | Merge branch 'avination' into careminsterMelanie2012-10-174-14/+37
|\ \ \ \ \ | |/ / / /
| * | | | Fix perms when linking an object. Set root part perms to the permsMelanie2012-10-144-14/+29
| | | | | | | | | | | | | | | | | | | | | | | | | of the link set to make the build floater behave consistently. Fixes permissions exploit introduced on 23 August.
| * | | | Change permissions on child prim inventory items when god mode "forceMelanie2012-10-082-2/+10
| | |/ / | |/| | | | | | | | | | permissive" is used.
| * | | Allow default animation to be stopped to be replaced with another one.Melanie2012-10-042-16/+29
| |/ / | | | | | | | | | Fixes Mantis #6327
* | | Merge branch 'master' into careminsterMelanie2012-10-161-2/+3
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
| * | minor: Add/correct some doc messages associated with entity teleport.Justin Clark-Casey (justincc)2012-10-161-2/+3
| | | | | | | | | | | | | | | | | | I believe UseCircuitCode is sent on EnableSimulator EQ message, rather than EstablishAgentCommunication At least with LL 3.3.4, EstablishAgentCommunication appears unnecessary in the teleport context - viewer still requests it though possibly only after TeleportFinish(). However, we will continue to send it.
* | | Merge branch 'master' into careminsterMelanie2012-10-123-215/+316
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Get rid of accidental scene start left in ScenePresenceAutopilotTestsJustin Clark-Casey (justincc)2012-10-121-1/+0
| | |
| * | Fix problems with regression tests by allowing invoke of Update() with a ↵Justin Clark-Casey (justincc)2012-10-122-3/+5
| | | | | | | | | | | | finite number of frames even if the scene isn't active.
| * | Add "active true|false" to "debug scene" console command.Justin Clark-Casey (justincc)2012-10-121-3/+37
| | | | | | | | | | | | This allows the scene update and maintenance loops to be started and stopped for debug purposes.
| * | minor: Add method doc to EventManager.OnNewClient, OnClientLogin, ↵Justin Clark-Casey (justincc)2012-10-101-0/+14
| | | | | | | | | | | | ClientClosed, OnRemovePresence that any long-running operations should be launched on a thread separate to the event thread.
| * | Lock on AgentCircuitData during Scene.AddClient() and RemoveClient() to ↵Justin Clark-Casey (justincc)2012-10-101-201/+256
| | | | | | | | | | | | | | | | | | prevent an inactive connection being left behind if the user closes the viewer whilst the connection is being established. This should remove the need to run the console command "kick user --force" when these connections are left around.
| * | minor: elaborate method doc on Scene.NewUserConnection()Justin Clark-Casey (justincc)2012-10-091-6/+13
| | |
| * | Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2012-10-081-1/+1
| |\ \
| * | | Add bool to TriggerSceneObjectPartUpdated where full = true indicates a full ↵Dan Lake2012-10-052-5/+5
| | | | | | | | | | | | | | | | update. There should be a better way to indicate which properties have changed that is non LLUDP-centric
| * | | Trigger ObjectAddedToScene when loading objects from oarfile. Already ↵Dan Lake2012-10-051-1/+8
| | | | | | | | | | | | | | | | triggers when creating, duplicating or loading from database, incoming attachments, etc
* | | | Fix merge issuesMelanie2012-10-071-7/+0
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-10-071-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
| * | | On receiving TaskInventoryAccepted with a destination folder in the binary ↵Justin Clark-Casey (justincc)2012-10-061-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bucket slot for RLV, notify the viewer about inventory folder updates. The viewer would not see the folder move without this, either on accept or decline. This commit also updates the TaskInventoryOffered message to better conform with the data LL uses Changes are, agentID is prim owner rather than prim id, agent name is now simply object name rather than name with owner detail, message is just folder name in single quotes, message is not timestamped. However, folder is not renamed "still #RLV/~<name>". Long term solution is probably not to do these operations server-side. Notes will be added to http://opensimulator.org/mantis/view.php?id=6311
| * | Forgot to actually remove the packetpool set code from scene.Justin Clark-Casey (justincc)2012-10-051-7/+0
| | |
* | | Merge branch 'master' into careminsterMelanie2012-10-043-16/+62
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
| * | Allow default animation to be stopped to be replaced with another one.Melanie2012-10-042-16/+29
| | | | | | | | | | | | Fixes Mantis #6327
| * | Add generic PercentageStat.Justin Clark-Casey (justincc)2012-10-041-1/+1
| | | | | | | | | | | | Not yet used.
| * | Add experimental "slow frames" stat, available in "show stats" and via the ↵Justin Clark-Casey (justincc)2012-10-041-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | monitoring module. This increments a SlowFrames counter if a frame takes over 120% of maximum time. This commit also introduces a generic OpenSim.Framework.Monitoring.Stat which is available to any code that wants to register a statistic. This is more granualar than asking objects to create their own reports. At some point this will supersede earlier IMonitor and IAlert facilities in MonitoringModule which are only available to scene code.
* | | Merge branch 'master' into careminsterMelanie2012-10-031-0/+6
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * | Prevent the ExtraSettings code from crashing SQLite driven sims.Melanie2012-10-021-0/+6
| | |
| * | Add MaxPrimsUndo config setting to [Startup] section of OpenSim.ini.Justin Clark-Casey (justincc)2012-09-275-19/+12
| | | | | | | | | | | | | | | | | | This controls how many undo steps the simulator will store for each prim. Default is now 20 rather than 5 as it briefly was. The default number could be increased through this is a memory tradeoff which will scale with the number of prims in the sim and level of activity.
| * | Don't store undo states if a scene object is manipulated when it is not in a ↵Justin Clark-Casey (justincc)2012-09-262-3/+26
| | | | | | | | | | | | | | | | | | scene. Adds regression test for this.
| * | refactor: Change control structures in SOP.StoreUndoState() to reduce nesting.Justin Clark-Casey (justincc)2012-09-261-45/+43
| | |
| * | Make it possible to rescale SOGs when they are not in a scene.Justin Clark-Casey (justincc)2012-09-262-34/+40
| | |
| * | Enforce existing 5 action hardcoded undo limit.Justin Clark-Casey (justincc)2012-09-263-27/+65
| | | | | | | | | | | | | | | | | | | | | This was present in the code but not enforced, which led to a memory leak over time as part properties were changed, whether by viewer, script or another source. This commit enforces that limit, which will soon become configurable. Regression test for undo limit added Should help with http://opensimulator.org/mantis/view.php?id=6279
| * | Add basic undo/redo regression tests.Justin Clark-Casey (justincc)2012-09-263-8/+137
| | |
* | | Merge branch 'avination' into careminsterMelanie2012-09-273-9/+20
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | add missing transactionID in SendInventoryItemCreateUpdate. and make useUbitUmarov2012-09-241-4/+15
| | | | | | | | | | | | | | | of it on inventoryAccessModule, etc. Most likelly it's needs where there is a transactionID not zero
| * | Comment out asset error for sculpts/meshes. If an asset is missing it's missing.Melanie2012-09-231-4/+4
| | | | | | | | | | | | We can't put it back so we don't need to know.
| * | Make IncomingCloseChildAgent not send a stop packet. This may preventMelanie2012-09-161-1/+1
| | | | | | | | | | | | a viewer from being logged out after an otherwise successful teleport.
* | | Remove a core undo call that we don't need.Melanie2012-09-271-2/+0
| | |
generated by cgit v1.1 at 2024-10-23 12:21:03 +0000