aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Merge branch 'ubitwork' into avinationMelanie2012-10-192-24/+101
| |\ \ \ \ | | |/ / /
| | * | | [UNTESTED] core Ode: stop trying to load a broken asset. Make brokenUbitUmarov2012-10-191-21/+97
| | | | | | | | | | | | | | | | | | | | assets behave like phantom by Nebadon request
| | * | | extend coment to include all unused SOG CheckSculptAndLoad()UbitUmarov2012-10-181-3/+4
| | | | |
* | | | | Merge branch 'master' into careminsterMelanie2012-10-281-1/+4
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | | | Deep copy the collection of at_target objects so it can't be modified whileMelanie2012-10-281-2/+5
| | |_|/ | |/| | | | | | | | | | it's being iterated
* | | | Merge branch 'master' into careminsterMelanie2012-10-284-15/+34
|\ \ \ \ | |/ / /
| * | | minor: Fix verbose IAR save message to make it a bit clearer that item data ↵Justin Clark-Casey (justincc)2012-10-271-1/+1
| | | | | | | | | | | | | | | | is being saved at that point, not asset data.
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-10-262-6/+8
| |\ \ \
| * | | | Fix "save iar" hanging permanently if the asset request phase times out.Justin Clark-Casey (justincc)2012-10-264-14/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike "save oar", this was happening on the same thread as the original request. The timeout happens on another so the original thread is never aborted. On "save oar" this leaves the thread hanging (still bad) but on "save iar" it left the console thread hanging. Temporary fix is to make "save iar" do asset request on a separate thread, like "save oar". Longer term fix will be to restructure asset save to use a ManualResetEvent rather than a separate timeout timer.
* | | | | Merge branch 'master' into careminsterMelanie2012-10-263-6/+8
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | 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-262-5/+7
| | | | |
| * | | | 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-2636-364/+903
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | minor: Make the error thrown logged when a simulator in grid mode is trying ↵Justin Clark-Casey (justincc)2012-10-261-1/+1
| | | | | | | | | | | | | | | | to set estate owner to a user that doesn't exist a little more obvious.
| * | | refactoring IWorldCommListenerInfo.GetRegexBitfield() method to be a field ↵SignpostMarv2012-10-262-14/+9
| | | | | | | | | | | | | | | | with a private setter
| * | | adding ability for listeners to be filtered by regular expressions and a ↵SignpostMarv2012-10-266-19/+242
| | | | | | | | | | | | | | | | general-purpose function to see if a given string matches a given regex
| * | | Formatting and casing correction in WorldCommModule, trailing new line in ↵SignpostMarv2012-10-263-5/+5
| | | | | | | | | | | | | | | | OSSL to get git diff to not complain
| * | | minor: Add comment as to why we are pulcking plain old ints out of the ↵Justin Clark-Casey (justincc)2012-10-261-0/+2
| | | | | | | | | | | | | | | | LSL_List when converting values from LSL for modInvoke()
| * | | Removing the apparently superfluous explicit namespace reference so that the ↵SignpostMarv2012-10-261-8/+2
| | | | | | | | | | | | | | | | if-else-if-else block in ConvertFromLSL can have a consistent appearance
| * | | system ints can end up in LSL lists, which can cause counter-intuitive ↵SignpostMarv2012-10-261-0/+2
| | | | | | | | | | | | | | | | unknown list element type errors in ConvertFromLSL (via modInvoke)
| * | | Comment out InventoryTransferModule.NeedSceneCacheClear() and invocations ↵Justin Clark-Casey (justincc)2012-10-263-103/+106
| | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Fixed saving non-square multi-region OARsOren Hurvitz2012-10-261-1/+1
| | | |
| * | | 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-253-18/+18
| | | |
| * | | 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-256-22/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Get osNpcCreate() and osNpcLoadAppearance() to generate a script error if ↵Justin Clark-Casey (justincc)2012-10-252-11/+30
| | | | | | | | | | | | | | | | appearance notecard does not exist, rather than returning UUID.Zero or silently failing.
| * | | When scripts generate expected exceptions (e.g. due to checked bad ↵Justin Clark-Casey (justincc)2012-10-255-9/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Make osNpcCreate() return UUID.Zero instead of throwing an exception if ↵Justin Clark-Casey (justincc)2012-10-253-12/+74
| | | | | | | | | | | | | | | | notecard name is invalid. Make osNpcLoadAppearance() fail silently in same circumstance rather than throwing exception.
| * | | Add TestOsNpcLoadAppearance()Justin Clark-Casey (justincc)2012-10-252-4/+45
| | | |
| * | | Move npc creation tests involving appearance from OSSL_ApiAppearanceTest to ↵Justin Clark-Casey (justincc)2012-10-252-70/+69
| | | | | | | | | | | | | | | | | | | | | | | | OSSL_ApiNpcTests This is a more intuitive location.
| * | | Allow "show object", "show part", "dump object" and "delete object" to ↵Justin Clark-Casey (justincc)2012-10-243-43/+97
| | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Get "save oar" and "save iar" to tell you in a more friendly manner if the ↵Justin Clark-Casey (justincc)2012-10-244-11/+19
| | | | | | | | | | | | | | | | | | | | | | | | filename to save already exists, rather than exception throwing. Also changes ConsoleUtil.CheckFileExists to CheckFileDoesNotExist() since this is more meaningful in the context, even though it does result in double negatives.
| * | | Add "dump object uuid" console command. This allows any object in the scene ↵Justin Clark-Casey (justincc)2012-10-241-0/+53
| | | | | | | | | | | | | | | | to be serialized and dumped to XML for debug purposes.
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-10-2410-390/+534
| |\ \ \
| | * | | BulletSim: fix problem with avatars sinking into the ground.Robert Adams2012-10-234-15/+23
| | | | | | | | | | | | | | | | | | | | Change terrain activation state to DISABLE_SIMULATION for better performance.
| | * | | BulletSim: minor change to insure avatar body recreation when shape changes.Robert Adams2012-10-231-3/+3
| | | | |
| * | | | minor: Move co-ordinate related help to object commands to common ↵Justin Clark-Casey (justincc)2012-10-241-33/+3
| | | | | | | | | | | | | | | | | | | | ConsoleUtil.CoordHelp
* | | | | Merge branch 'master' into careminsterMelanie2012-10-2314-390/+680
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | BulletSim: remove chatty debug message.Robert Adams2012-10-222-2/+2
| | | | |
| * | | | BulletSim: fix bug that caused error (and a crash on 32 bit Linux) when mesh ↵Robert Adams2012-10-228-35/+51
| | | | | | | | | | | | | | | | | | | | assets weren't already in the cache. Comment cleanups.
| * | | | BulletSim: fix problem of not rebuilding shape by clearing last rebuild ↵Robert Adams2012-10-222-2/+8
| | | | | | | | | | | | | | | | | | | | failed flag in BSPrim.ForceBodyShapeRebuild()
| * | | | BulletSim: remove trailing spaces to make git happy.Robert Adams2012-10-228-36/+36
| | | | |
| * | | | BulletSim: encorporate UBit's suggestion to save a copy of mesh raw data.Robert Adams2012-10-221-2/+1
| | | | |
| * | | | BulletSim: Create LinkSet abstract class and sparate constraint based ↵Robert Adams2012-10-223-319/+434
| |/ / / | | | | | | | | | | | | linksets into own subclass. Will eventually add manual movement linkset subclass.
| * | | Make it possible to turn the base UDP object packet pools on and off whilst ↵Justin Clark-Casey (justincc)2012-10-232-38/+131
| | | | | | | | | | | | | | | | | | | | | | | | running via the "debug lludp pool <on|off>" console command. For debug purposes. This does not currently apply to the higher LLUDP packetpool.
| * | | Add object count stats for new IncomingPacket and UDPPacketBuffer pools if ↵Justin Clark-Casey (justincc)2012-10-234-8/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-235-12/+127
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: OpenSim/Framework/LandData.cs
generated by cgit v1.1 at 2024-11-16 11:41:19 +0000