aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-10-262-4/+6
|\ | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Separate LSL's notion of the default anim from the actually playing anims.Melanie2012-10-261-2/+4
| |
| * Revert "Fix for Mantis 0006376: Avatar no longer show Walking animation when ↵Melanie2012-10-261-1/+1
| | | | | | | | | | | | any AO hud is" This reverts commit fa484c3494a7190b4d7526094347be74d091e125.
* | Merge branch 'master' into careminsterMelanie2012-10-266-29/+107
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
| * Comment out InventoryTransferModule.NeedSceneCacheClear() and invocations ↵Justin Clark-Casey (justincc)2012-10-261-11/+13
| | | | | | | | | | | | since the call itself does nothing and the return value is ignored by all callers. This is a very old method (+4 years) so is probably confusing code cruft.
| * minor: if a scene is already shutting down on Scene.Close(), warn and exit ↵Justin Clark-Casey (justincc)2012-10-251-0/+6
| | | | | | | | | | | | instead of attempting to run another shutdown concurrently. Thanks to Oren Hurvitz for this change.
| * Changed "course" to "coarse" in several placesOren Hurvitz2012-10-251-7/+7
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-10-251-1/+1
| |\
| | * Fix for Mantis 0006376: Avatar no longer show Walking animation when any AO ↵nebadon2012-10-251-1/+1
| | | | | | | | | | | | | | | | | | hud is loaded. Thank you tglion
| * | In Scene.Close(), dispose of the physics scene after base.Close() since ↵Justin Clark-Casey (justincc)2012-10-252-6/+25
| |/ | | | | | | | | | | | | | | script events can still access Physics scene until the script engine shuts down (triggered off base.Close()) XEngine listeners to EventManager.OnShutdown which is triggered from base.Close(). Possibly it could listen for the earlier OnSceneShuttingDown instead, but the easier solution right now is to relocate disposal of the physics scene. This bug has existed since c150320 (Thu Jul 26 15:27:18 2012) and was in 0.7.4
| * Fix script error messages not showing up in viewer 3 and associated viewers.Justin Clark-Casey (justincc)2012-10-251-0/+12
| | | | | | | | | | | | | | Viewer 3 will discard such a message if the chat message owner does not match the avatar. We were filling the ownerID with the primID, so this never matched, hence viewer 3 did not see any script error messages. This commit fills the ownerID in with the prim ownerID so the script owner will receive script error messages. This does not affect viewer 1 and associated viewers which continue to process script errors as normal.
| * When scripts generate expected exceptions (e.g. due to checked bad ↵Justin Clark-Casey (justincc)2012-10-251-1/+4
| | | | | | | | | | | | | | parameter) throw ScriptException instead of just a plain old exception. This is to make it easier to distinguish these exceptions from unexpected OpenSimulator problems internally and in regression tests. No functional changes.
| * Allow "show object", "show part", "dump object" and "delete object" to ↵Justin Clark-Casey (justincc)2012-10-242-1/+36
| | | | | | | | | | | | accept a local ID as well as a UUID. This means that the sub-commands are now id rather than uuid, e.g. show object id
* | Merge branch 'master' into careminsterMelanie2012-10-231-2/+4
|\ \ | |/
| * Add object count stats for new IncomingPacket and UDPPacketBuffer pools if ↵Justin Clark-Casey (justincc)2012-10-231-2/+4
| | | | | | | | | | | | | | | | they are enabled. Add count stats for existing LLUDP pool. This introduces a pull stat type in addition to the push stat type. A pull stat takes a method on construction which knows how to update the stat on request. In this way, special interfaces for pull stat collection are not necessary.
* | Merge branch 'master' into careminsterMelanie2012-10-201-2/+2
|\ \ | |/
| * minor: Rename assetCache constructor param in UUIDGatherer to assetService ↵Justin Clark-Casey (justincc)2012-10-201-2/+2
| | | | | | | | which is what it is.
| * normalize quaternion.Slerp outputsUbitUmarov2012-10-191-0/+1
| | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
* | 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
generated by cgit v1.1 at 2024-12-25 05:11:47 +0000