ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-09 05:05:51 +08:00
Code Issues Packages Projects Releases Wiki Activity
23,118 Commits 5 Branches 97 Tags
68b910c1ff03d241e2aec65ebe67ffaa58babbf6
Commit Graph

381 Commits

Author SHA1 Message Date
Melanie
f39e4abf0e Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
 2013-03-03 13:24:37 +00:00
root
d7c742a5f9 Remove osParseJSONNew because it's "object" return type is not useful for LSL 2013-02-25 23:01:03 +01:00
Melanie
d3892bbd06 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Framework/Servers/VersionInfo.cs
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
 2013-02-05 21:30:12 +00:00
Justin Clark-Casey (justincc)
1f1da23097 Bump version and assembly version numbers from 0.7.5 to 0.7.6 
This is mostly Bluewall's work but I am also bumping the general version number
OpenSimulator 0.7.5 remains in the release candidate stage.
I'm doing this because master is significantly adding things that will not be in 0.7.5
This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names
and so the exact version match requirement is not in force.
 2013-02-05 00:23:17 +00:00
Melanie
c6e6614a44 Merge branch 'avination' into careminster 2013-01-24 23:25:38 +00:00
Melanie
e785242c49 Reintroduce the return value of llGiveMoney. The grid will crash and burn without it. 2013-01-24 18:23:39 +01:00
Melanie
6a2b673fca Remove the return value from llGiveMoney and add llTransferLindenDollars. Also 
make llGiveMoney async so the script thread is not held up waiting for comms
to an external server.
 2013-01-23 19:45:36 +00:00
Melanie
fc1c77b42d Merge branch 'avination' into careminster 2013-01-23 19:31:27 +00:00
Melanie
47f18caa22 Remove the return value from llGiveMoney (it was a LSL extension of OpenSim) and 
make the function async so the script thread is not held up waiting for comms
to an external server.
 2013-01-23 18:58:29 +01:00
Melanie
12efac494a Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
 2013-01-19 02:38:04 +00:00
Talun
27e2ec177a New constants for llGetObjectDetails 
New constants for llGetObjectDetails OBJECT_CHARACTER_TIME,
OBJECT_ROOT, OBJECT_ATTACHED_POINT, OBJECT_PATHFINDING_TYPE,
OBJECT_PHYSICS, OBJECT_PHANTOM and OBJECT_TEMP_ON_REZ
also Pathfining constants, 3 of which are used by llGetObjectDetails
 2013-01-19 01:50:16 +00:00
Melanie
fc5711fa7a Merge commit '8bf0a9f85dda4b1831630b65620d5c6868196c11' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
 2013-01-16 01:11:20 +00:00
Robert Adams
eacc2561d1 BulletSim: add osGetPhysicsEngineType() LSL function and update 
the physics engines to return the name that is specified in the INI
file ("physics = XXX") as the type of engine.
This os function is a little different than the others in that it
does not throw an exception of one is not privilaged to use it.
It merely returns an empty string.
 2013-01-11 16:47:35 -08:00
Melanie
06fa1681ae Merge branch 'master' into careminster 2012-11-15 00:43:26 +00:00
Diva Canto
aeeaa3a0a9 Added AssemblyInfos to every dll in the OpenSim.Region namespace. 2012-11-14 11:09:43 -08:00
Melanie
415b89f434 Merge branch 'master' into careminster 2012-11-09 22:58:42 +00:00
PixelTomsen
64c80aec64 llSetLinkCamera implementation 
wiki: http://wiki.secondlife.com/wiki/LlSetLinkCamera

mantis: http://opensimulator.org/mantis/view.php?id=6397
 2012-11-09 14:31:56 -08:00
Melanie
26cc57b6ca Merge branch 'master' into careminster 
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
 2012-10-26 21:13:01 +01:00
SignpostMarv
e977761071 adding ability for listeners to be filtered by regular expressions and a general-purpose function to see if a given string matches a given regex 2012-10-26 02:08:00 +01:00
Melanie
13cef0b16a Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/LandData.cs
 2012-10-23 17:23:36 +01:00
BlueWall
2aac113ac1 Add CLICK_ACTION_ZOOM 
Add support for V2/3 CLICK_ACTION_ZOOM to llSetClickAction
 2012-10-20 04:32:04 -04:00
Melanie
23d5bafa7f Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
 2012-10-03 00:24:33 +01:00
SignpostMarv
ce7694c108 added perms checking, duplicated functionality to methods that do not require perms and have higher threat level 2012-10-02 22:14:46 +01:00
SignpostMarv
35b7c80e0b implementing osDropAttachment & osDropAttachmentAt 2012-10-02 22:14:46 +01:00
Melanie
924df14c5e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
	OpenSim/Framework/Servers/VersionInfo.cs
 2012-09-07 19:49:46 +01:00
SignpostMarv
07dbe46ba3 wrapping attachment functions in a region 2012-09-04 00:03:44 +01:00
SignpostMarv
ff867b59cf Implementing functing to send messages directly to attachments 2012-09-04 00:03:44 +01:00
SignpostMarv
a858c5daee implementing a function to get the number of attachments worn 2012-09-04 00:03:43 +01:00
Melanie
1b15144208 Merge branch 'master' into careminster 
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
 2012-08-31 01:32:18 +01:00
Mic Bowman
3d736d575f This partially implements the LSL function to set the response 
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.
 2012-08-29 14:56:51 -07:00
Melanie
7cdb564fdd Merge branch 'master' into careminster 2012-08-24 01:22:44 +01:00
Justin Clark-Casey (justincc)
a08687aef3 Revert "implementing function to allow scripts to self-replicate as if the owner duplicated them, using the same script delay as llRezObject()" 
This reverts commit 2ad9d656b3.

Reverted pending consideration of associated issues.
 2012-08-24 01:18:35 +01:00
SignpostMarv
2ad9d656b3 implementing function to allow scripts to self-replicate as if the owner duplicated them, using the same script delay as llRezObject() 2012-08-24 00:21:42 +01:00
TBG Renfold
4f3fabae5b Adds osGetHealth. 
Returns the amount of health (in an integer) that an avatar has left in the scene.
If an avatar is not found or safe is enabled on a region, -1 is returned.

Example usage:

default
{
    touch_end(integer _t)
    {
        key agentID = llDetectedKey(0);
        osCauseDamage(agentID, 50);
        llSay(0, llKey2Name(agentID) + " has " + (string)osGetHealth(agentID) + "% health left.");
    }
}
 2012-08-24 00:13:14 +01:00
Melanie
aee7a31bc3 Merge branch 'master' into careminster 
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
 2012-08-18 13:17:39 +01:00
SignpostMarv
466d684fbe implemented 2012-08-17 23:23:03 +01:00
Melanie
90ad98370a Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-08-16 02:46:48 +01:00
SignpostMarv
7679384829 adding ATTACH_*_PEC constants 2012-08-15 22:06:20 +01:00
Melanie
0c00abcce1 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
 2012-08-03 16:46:11 +01:00
SignpostMarv
cd2c5843a8 reduced-complexity implementation of function to get rezzing object key 
Signed-off-by: Melanie <melanie@t-data.com>
 2012-08-02 22:12:36 +01:00
Melanie
771d79e83e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Monitoring/BaseStatsCollector.cs
	OpenSim/Region/Application/OpenSim.cs
	OpenSim/Region/Application/OpenSimBase.cs
	OpenSim/Region/Framework/Scenes/SceneManager.cs
	bin/OpenMetaverse.Rendering.Meshmerizer.dll
	bin/OpenMetaverse.StructuredData.dll
	bin/OpenMetaverse.dll
	bin/OpenMetaverseTypes.dll
	prebuild.xml
 2012-07-28 00:39:36 +01:00
SignpostMarv
72d29bdb40 LSL/OSSL lacks Math.Min & Math.Max implementations. 2012-07-28 00:09:11 +01:00
Melanie
af05aaaf36 Remove support for the OS_NPC constant. That one seems to be overly paranoid 
to have and confuses the issue.
 2012-07-25 01:28:11 +01:00
Melanie
fb8e92c90b Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Helpers.cs
	prebuild.xml
 2012-07-23 18:54:12 +01:00
Melanie
03ff782c3c Merge branch 'master' into careminster 2012-07-20 22:12:02 +01:00
Justin Clark-Casey (justincc)
bcfc392edf As per opensim-dev mailing list conversation, introduce OS_NPC constant for use with llSensor() 
This same constant will later be used with llGetDetectedType().
This constant has a different name from NPC to avoid possible conflict with future LSL changes.
This constant has a different value to try and avoid unnecessary conflict with future constants that may use the same value.
Using the 'NPC' constant with llSensor() will remain valid but is deprecated.
 2012-07-20 21:08:04 +01:00
Mic Bowman
644fb6b013 Implements a very useful OSSL function to test a string to see 
if it is a UUID. The function is osIsUUID().

Thanks SignpostMarv!
 2012-07-20 10:25:50 -07:00
SignpostMarv
8d59385eea Implementation of llSetRegionPos(). Does not implement failure on object entry/prim limit/access restrictions. 
Signed-off-by: SignpostMarv <github@signpostmarv.name>
 2012-07-14 01:45:34 +01:00
Melanie
0bc8238a6c Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Watchdog.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2012-07-11 03:56:50 +01:00
Justin Clark-Casey (justincc)
c8af20f966 This script allows an object to be attached directly from prim inventory to another avatar in the scene. 
Very useful in serious game/environment scenarios where its only allowed for trusted creators.
Threat level Severe
 2012-07-09 23:08:41 +01:00