Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'avination' into careminster | Melanie | 2012-10-03 | 1 | -1/+12 |
|\ | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * | Fix a viewer crash issue | Melanie | 2012-10-03 | 1 | -1/+12 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-10-03 | 3 | -1/+132 |
|\ \ | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | ||||
| * | | correcting typo | SignpostMarv | 2012-10-02 | 1 | -3/+3 |
| | | | |||||
| * | | taking into account the recent introduction of implicit operators | SignpostMarv | 2012-10-02 | 1 | -3/+1 |
| | | | |||||
| * | | added perms checking, duplicated functionality to methods that do not ↵ | SignpostMarv | 2012-10-02 | 3 | -6/+86 |
| | | | | | | | | | | | | require perms and have higher threat level | ||||
| * | | fixing copypasta | SignpostMarv | 2012-10-02 | 1 | -1/+1 |
| | | | |||||
| * | | implementing osDropAttachment & osDropAttachmentAt | SignpostMarv | 2012-10-02 | 3 | -2/+53 |
| | | | |||||
* | | | Merge branch 'avination' into careminster | Melanie | 2012-09-29 | 1 | -3/+10 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | Melanie | 2012-09-28 | 1 | -23/+17 |
| |\ \ | |||||
| * | | | Fix a possible NRE | Melanie | 2012-09-28 | 1 | -3/+10 |
| | | | | |||||
* | | | | Merge branch 'avination' into careminster | Melanie | 2012-09-27 | 1 | -23/+17 |
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| * | | | Streamline and improve llGetMass | Melanie | 2012-09-26 | 1 | -23/+17 |
| |/ / | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-09-24 | 2 | -8/+150 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| * | | Fix llListFindList() returning no match when there is a match with a script ↵ | Justin Clark-Casey (justincc) | 2012-09-22 | 2 | -8/+150 |
| | | | | | | | | | | | | | | | | | | | | | | | | constant component in the source list. Adds regression test for this case. Based on http://opensimulator.org/mantis/view.php?id=6156 Thanks SignpostMarv. | ||||
* | | | Merge branch 'avination' into careminster | Melanie | 2012-09-10 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | |||||
| * | | Catch zero UUIDs in LSL and shout as an error. Also catch attempts to send IM | Melanie | 2012-09-09 | 1 | -1/+1 |
| | | | | | | | | | | | | to UUID.Zero because it ties up XMLRPC handlers needlessly. | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-09-10 | 1 | -4/+4 |
|\ \ \ | | |/ | |/| | |||||
| * | | passing in the function name to MOD_Api.ConvertFromLSL for more ↵ | SignpostMarv | 2012-09-10 | 1 | -4/+4 |
| | | | | | | | | | | | | user-friendly error messages | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-09-09 | 2 | -11/+11 |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| * | | refactoring to allow Scene.GetLandData to accept Vector3 as an argument. ↵ | SignpostMarv | 2012-09-08 | 2 | -10/+10 |
| | | | | | | | | | | | | Note that the prior work on LSL_Vector implicit operators means one does not need to explicitly cast a LSL_Vector to Vector3 | ||||
| * | | 4096 is used in various places as the maximum height of a region, ↵ | SignpostMarv | 2012-09-08 | 1 | -1/+1 |
| | | | | | | | | | | | | refactoring to be a constant | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-09-07 | 5 | -3/+266 |
|\ \ \ | |/ / | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Framework/Servers/VersionInfo.cs | ||||
| * | | Enables cast from int to float for MOD* functions; | Mic Bowman | 2012-09-05 | 1 | -1/+1 |
| | | | | | | | | | | | | Thanks SignpostMarv! | ||||
| * | | wrapping attachment functions in a region | SignpostMarv | 2012-09-04 | 3 | -2/+4 |
| | | | |||||
| * | | Implementing functing to send messages directly to attachments | SignpostMarv | 2012-09-04 | 4 | -0/+201 |
| | | | |||||
| * | | refactoring the grunt work of MessageObject into a private method with a ↵ | SignpostMarv | 2012-09-04 | 1 | -0/+5 |
| | | | | | | | | | | | | UUID argument | ||||
| * | | implementing a function to get the number of attachments worn | SignpostMarv | 2012-09-04 | 3 | -0/+55 |
| | | | |||||
| * | | Revert "made setting rotation match Second Life" | Melanie | 2012-09-03 | 1 | -1/+32 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Second Life seems to have introduced a bug, as we have confirmation that SL behavior changed recently and changed in contradiction to their stated intention This appears to be another of the bugs SL is notorious for. Signpost and I have decided to back this out until SL's intention becomes clear. This reverts commit f7b88d1c40ba06c62491d8d32809fe6c1c4d360d. | ||||
| * | | Revert "no need to assign rotation to a variable now" | Melanie | 2012-09-03 | 1 | -1/+2 |
| | | | | | | | | | | | | This reverts commit a3d140b57c5e2ae0f3334d59b82e116d40199b49. | ||||
| * | | Revert "formatting" | Melanie | 2012-09-03 | 1 | -2/+2 |
| | | | | | | | | | | | | This reverts commit fb211c64fd9d335f4879549023870b1e28416f74. | ||||
* | | | Revert "made setting rotation match Second Life" | Melanie | 2012-09-03 | 1 | -1/+32 |
| | | | | | | | | | | | | This reverts commit f7b88d1c40ba06c62491d8d32809fe6c1c4d360d. | ||||
* | | | Revert "no need to assign rotation to a variable now" | Melanie | 2012-09-03 | 1 | -1/+2 |
| | | | | | | | | | | | | This reverts commit a3d140b57c5e2ae0f3334d59b82e116d40199b49. | ||||
* | | | Revert "formatting" | Melanie | 2012-09-03 | 1 | -2/+2 |
| | | | | | | | | | | | | This reverts commit fb211c64fd9d335f4879549023870b1e28416f74. | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-09-03 | 1 | -44/+3 |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * | | formatting | SignpostMarv | 2012-09-03 | 1 | -2/+2 |
| | | | |||||
| * | | no need to assign rotation to a variable now | SignpostMarv | 2012-09-03 | 1 | -2/+1 |
| | | | |||||
| * | | made setting rotation match Second Life | SignpostMarv | 2012-09-03 | 1 | -32/+1 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-08-31 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Implementing a vastly simpler means of allowing region modules to access ↵ | SignpostMarv | 2012-08-31 | 1 | -1/+1 |
| | | | | | | | | | | | | GetLinkParts than mantis 6236 | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-08-31 | 4 | -12/+37 |
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | ||||
| * | | fixing bug where last element in list is ignored | SignpostMarv | 2012-08-30 | 1 | -1/+1 |
| | | | |||||
| * | | refactoring as the list funcs either skip invalid values or recall ToDoubleList | SignpostMarv | 2012-08-30 | 1 | -12/+11 |
| | | | |||||
| * | | This partially implements the LSL function to set the response | Mic Bowman | 2012-08-29 | 3 | -1/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | type for an HTTP request. Since the "official" LSL function limits the use of the response type, it is implemented as osSetContentType with a string for the content mime type and a threat level of high. With this function you should be able to implement rather functional media-on-a-prim application with much less difficulty. | ||||
* | | | Merge branch 'avination' into careminster | Melanie | 2012-08-31 | 1 | -3/+6 |
|\ \ \ | | |/ | |/| | |||||
| * | | Allow llList2Key to also act on System.String | Melanie | 2012-08-29 | 1 | -1/+2 |
| | | | |||||
| * | | Merge branch 'ubitwork' into avination | Melanie | 2012-08-29 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | [possible still very broken] mess around keyframes. timer events | UbitUmarov | 2012-08-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | threads overlaps, some null objects exceptions, region crossing... | ||||
| * | | | Make llCollisionSprite not throw anymore | Melanie | 2012-08-25 | 1 | -1/+2 |
| |/ / | |||||
| * | | Merge branch 'ubitwork' into avination | Melanie | 2012-08-24 | 1 | -2/+3 |
| |\ \ |