diff options
| author | Melanie | 2009-08-31 11:58:49 +0100 |
|---|---|---|
| committer | Melanie | 2009-08-31 11:58:49 +0100 |
| commit | 9e6684661ad0f65e2b9e87e44a03b858eea011ec (patch) | |
| tree | 0828d50bfc7dde7966b05fd9501e57d634c1094a /OpenSim/Region/ScriptEngine/Shared/Api/Implementation | |
| parent | Change the return value if the compiler to "object" to allow compilers (diff) | |
| parent | oops. fixing missing argument. (diff) | |
| download | opensim-SC_OLD-9e6684661ad0f65e2b9e87e44a03b858eea011ec.zip opensim-SC_OLD-9e6684661ad0f65e2b9e87e44a03b858eea011ec.tar.gz opensim-SC_OLD-9e6684661ad0f65e2b9e87e44a03b858eea011ec.tar.bz2 opensim-SC_OLD-9e6684661ad0f65e2b9e87e44a03b858eea011ec.tar.xz | |
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 0de5c9b..bca019b 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
| @@ -880,6 +880,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 880 | return drawList; | 880 | return drawList; |
| 881 | } | 881 | } |
| 882 | 882 | ||
| 883 | public string osSetFontName(string drawList, string fontName) | ||
| 884 | { | ||
| 885 | CheckThreatLevel(ThreatLevel.None, "osSetFontName"); | ||
| 886 | |||
| 887 | m_host.AddScriptLPS(1); | ||
| 888 | drawList += "FontName "+ fontName +"; "; | ||
| 889 | return drawList; | ||
| 890 | } | ||
| 891 | |||
| 883 | public string osSetPenSize(string drawList, int penSize) | 892 | public string osSetPenSize(string drawList, int penSize) |
| 884 | { | 893 | { |
| 885 | CheckThreatLevel(ThreatLevel.None, "osSetPenSize"); | 894 | CheckThreatLevel(ThreatLevel.None, "osSetPenSize"); |