diff options
author | Justin Clark-Casey (justincc) | 2010-04-01 23:59:00 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-04-01 23:59:00 +0100 |
commit | e0eba26f7bd2258ec026a42e278420fa0938cea7 (patch) | |
tree | 39ae2410374c07ff62a52af3551888746ed36c3c /OpenSim | |
parent | oops, add file missing from last commit (diff) | |
parent | First attempt at fixing mantis #4641. It's better but there are now some issu... (diff) | |
download | opensim-SC-e0eba26f7bd2258ec026a42e278420fa0938cea7.zip opensim-SC-e0eba26f7bd2258ec026a42e278420fa0938cea7.tar.gz opensim-SC-e0eba26f7bd2258ec026a42e278420fa0938cea7.tar.bz2 opensim-SC-e0eba26f7bd2258ec026a42e278420fa0938cea7.tar.xz |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to '')
26 files changed, 1619 insertions, 23 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs index 2dec72d..17bd795 100644 --- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs +++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs | |||
@@ -930,7 +930,7 @@ namespace OpenSim.Client.MXP.ClientStack | |||
930 | // Need to translate to MXP somehow | 930 | // Need to translate to MXP somehow |
931 | } | 931 | } |
932 | 932 | ||
933 | public void SendGenericMessage(string method, List<string> message) | 933 | public void SendGenericMessage(string method, List<byte[]> message) |
934 | { | 934 | { |
935 | // Need to translate to MXP somehow | 935 | // Need to translate to MXP somehow |
936 | } | 936 | } |
diff --git a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs index 9cb2172..4ecbaf9 100644 --- a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs +++ b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs | |||
@@ -503,7 +503,7 @@ namespace OpenSim.Client.Sirikata.ClientStack | |||
503 | throw new System.NotImplementedException(); | 503 | throw new System.NotImplementedException(); |
504 | } | 504 | } |
505 | 505 | ||
506 | public void SendGenericMessage(string method, List<string> message) | 506 | public void SendGenericMessage(string method, List<byte[]> message) |
507 | { | 507 | { |
508 | throw new System.NotImplementedException(); | 508 | throw new System.NotImplementedException(); |
509 | } | 509 | } |
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs index a427dd3..1da746a 100644 --- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs +++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs | |||
@@ -509,7 +509,7 @@ namespace OpenSim.Client.VWoHTTP.ClientStack | |||
509 | throw new System.NotImplementedException(); | 509 | throw new System.NotImplementedException(); |
510 | } | 510 | } |
511 | 511 | ||
512 | public void SendGenericMessage(string method, List<string> message) | 512 | public void SendGenericMessage(string method, List<byte[]> message) |
513 | { | 513 | { |
514 | throw new System.NotImplementedException(); | 514 | throw new System.NotImplementedException(); |
515 | } | 515 | } |
diff --git a/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs b/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs index c849f38..d6cb91f 100644 --- a/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs +++ b/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs | |||
@@ -691,7 +691,16 @@ VALUES | |||
691 | cmd.ExecuteNonQuery(); | 691 | cmd.ExecuteNonQuery(); |
692 | } | 692 | } |
693 | } | 693 | } |
694 | 694 | public RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID) | |
695 | { | ||
696 | //This connector doesn't support the windlight module yet | ||
697 | //Return default LL windlight settings | ||
698 | return new RegionLightShareData(); | ||
699 | } | ||
700 | public void StoreRegionWindlightSettings(RegionLightShareData wl) | ||
701 | { | ||
702 | //This connector doesn't support the windlight module yet | ||
703 | } | ||
695 | /// <summary> | 704 | /// <summary> |
696 | /// Loads the settings of a region. | 705 | /// Loads the settings of a region. |
697 | /// </summary> | 706 | /// </summary> |
@@ -718,7 +727,7 @@ VALUES | |||
718 | } | 727 | } |
719 | } | 728 | } |
720 | 729 | ||
721 | //If comes here then there is now region setting for that region | 730 | //If we reach this point then there are new region settings for that region |
722 | regionSettings = new RegionSettings(); | 731 | regionSettings = new RegionSettings(); |
723 | regionSettings.RegionUUID = regionUUID; | 732 | regionSettings.RegionUUID = regionUUID; |
724 | regionSettings.OnSave += StoreRegionSettings; | 733 | regionSettings.OnSave += StoreRegionSettings; |
diff --git a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs index a06eec3..a395ddc 100644 --- a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs +++ b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs | |||
@@ -711,6 +711,102 @@ namespace OpenSim.Data.MySQL | |||
711 | } | 711 | } |
712 | } | 712 | } |
713 | 713 | ||
714 | public RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID) | ||
715 | { | ||
716 | RegionLightShareData nWP = new RegionLightShareData(); | ||
717 | nWP.OnSave += StoreRegionWindlightSettings; | ||
718 | |||
719 | using (MySqlConnection dbcon = new MySqlConnection(m_connectionString)) | ||
720 | { | ||
721 | dbcon.Open(); | ||
722 | |||
723 | string command = "select * from `regionwindlight` where region_id = ?regionID"; | ||
724 | |||
725 | using(MySqlCommand cmd = new MySqlCommand(command)) | ||
726 | { | ||
727 | cmd.Connection = dbcon; | ||
728 | |||
729 | cmd.Parameters.AddWithValue("?regionID", regionUUID.ToString()); | ||
730 | |||
731 | IDataReader result = ExecuteReader(cmd); | ||
732 | if (!result.Read()) | ||
733 | { | ||
734 | //No result, so store our default windlight profile and return it | ||
735 | nWP.regionID = regionUUID; | ||
736 | StoreRegionWindlightSettings(nWP); | ||
737 | return nWP; | ||
738 | } | ||
739 | else | ||
740 | { | ||
741 | UUID.TryParse(result["region_id"].ToString(), out nWP.regionID); | ||
742 | nWP.waterColor.X = Convert.ToSingle(result["water_color_r"]); | ||
743 | nWP.waterColor.Y = Convert.ToSingle(result["water_color_g"]); | ||
744 | nWP.waterColor.Z = Convert.ToSingle(result["water_color_b"]); | ||
745 | nWP.waterFogDensityExponent = Convert.ToSingle(result["water_fog_density_exponent"]); | ||
746 | nWP.underwaterFogModifier = Convert.ToSingle(result["underwater_fog_modifier"]); | ||
747 | nWP.reflectionWaveletScale.X = Convert.ToSingle(result["reflection_wavelet_scale_1"]); | ||
748 | nWP.reflectionWaveletScale.Y = Convert.ToSingle(result["reflection_wavelet_scale_2"]); | ||
749 | nWP.reflectionWaveletScale.Z = Convert.ToSingle(result["reflection_wavelet_scale_3"]); | ||
750 | nWP.fresnelScale = Convert.ToSingle(result["fresnel_scale"]); | ||
751 | nWP.fresnelOffset = Convert.ToSingle(result["fresnel_offset"]); | ||
752 | nWP.refractScaleAbove = Convert.ToSingle(result["refract_scale_above"]); | ||
753 | nWP.refractScaleBelow = Convert.ToSingle(result["refract_scale_below"]); | ||
754 | nWP.blurMultiplier = Convert.ToSingle(result["blur_multiplier"]); | ||
755 | nWP.bigWaveDirection.X = Convert.ToSingle(result["big_wave_direction_x"]); | ||
756 | nWP.bigWaveDirection.Y = Convert.ToSingle(result["big_wave_direction_y"]); | ||
757 | nWP.littleWaveDirection.X = Convert.ToSingle(result["little_wave_direction_x"]); | ||
758 | nWP.littleWaveDirection.Y = Convert.ToSingle(result["little_wave_direction_y"]); | ||
759 | UUID.TryParse(result["normal_map_texture"].ToString(), out nWP.normalMapTexture); | ||
760 | nWP.horizon.X = Convert.ToSingle(result["horizon_r"]); | ||
761 | nWP.horizon.Y = Convert.ToSingle(result["horizon_g"]); | ||
762 | nWP.horizon.Z = Convert.ToSingle(result["horizon_b"]); | ||
763 | nWP.horizon.W = Convert.ToSingle(result["horizon_i"]); | ||
764 | nWP.hazeHorizon = Convert.ToSingle(result["haze_horizon"]); | ||
765 | nWP.blueDensity.X = Convert.ToSingle(result["blue_density_r"]); | ||
766 | nWP.blueDensity.Y = Convert.ToSingle(result["blue_density_g"]); | ||
767 | nWP.blueDensity.Z = Convert.ToSingle(result["blue_density_b"]); | ||
768 | nWP.blueDensity.W = Convert.ToSingle(result["blue_density_i"]); | ||
769 | nWP.hazeDensity = Convert.ToSingle(result["haze_density"]); | ||
770 | nWP.densityMultiplier = Convert.ToSingle(result["density_multiplier"]); | ||
771 | nWP.distanceMultiplier = Convert.ToSingle(result["distance_multiplier"]); | ||
772 | nWP.maxAltitude = Convert.ToUInt16(result["max_altitude"]); | ||
773 | nWP.sunMoonColor.X = Convert.ToSingle(result["sun_moon_color_r"]); | ||
774 | nWP.sunMoonColor.Y = Convert.ToSingle(result["sun_moon_color_g"]); | ||
775 | nWP.sunMoonColor.Z = Convert.ToSingle(result["sun_moon_color_b"]); | ||
776 | nWP.sunMoonColor.W = Convert.ToSingle(result["sun_moon_color_i"]); | ||
777 | nWP.sunMoonPosition = Convert.ToSingle(result["sun_moon_position"]); | ||
778 | nWP.ambient.X = Convert.ToSingle(result["ambient_r"]); | ||
779 | nWP.ambient.Y = Convert.ToSingle(result["ambient_g"]); | ||
780 | nWP.ambient.Z = Convert.ToSingle(result["ambient_b"]); | ||
781 | nWP.ambient.W = Convert.ToSingle(result["ambient_i"]); | ||
782 | nWP.eastAngle = Convert.ToSingle(result["east_angle"]); | ||
783 | nWP.sunGlowFocus = Convert.ToSingle(result["sun_glow_focus"]); | ||
784 | nWP.sunGlowSize = Convert.ToSingle(result["sun_glow_size"]); | ||
785 | nWP.sceneGamma = Convert.ToSingle(result["scene_gamma"]); | ||
786 | nWP.starBrightness = Convert.ToSingle(result["star_brightness"]); | ||
787 | nWP.cloudColor.X = Convert.ToSingle(result["cloud_color_r"]); | ||
788 | nWP.cloudColor.Y = Convert.ToSingle(result["cloud_color_g"]); | ||
789 | nWP.cloudColor.Z = Convert.ToSingle(result["cloud_color_b"]); | ||
790 | nWP.cloudColor.W = Convert.ToSingle(result["cloud_color_i"]); | ||
791 | nWP.cloudXYDensity.X = Convert.ToSingle(result["cloud_x"]); | ||
792 | nWP.cloudXYDensity.Y = Convert.ToSingle(result["cloud_y"]); | ||
793 | nWP.cloudXYDensity.Z = Convert.ToSingle(result["cloud_density"]); | ||
794 | nWP.cloudCoverage = Convert.ToSingle(result["cloud_coverage"]); | ||
795 | nWP.cloudScale = Convert.ToSingle(result["cloud_scale"]); | ||
796 | nWP.cloudDetailXYDensity.X = Convert.ToSingle(result["cloud_detail_x"]); | ||
797 | nWP.cloudDetailXYDensity.Y = Convert.ToSingle(result["cloud_detail_y"]); | ||
798 | nWP.cloudDetailXYDensity.Z = Convert.ToSingle(result["cloud_detail_density"]); | ||
799 | nWP.cloudScrollX = Convert.ToSingle(result["cloud_scroll_x"]); | ||
800 | nWP.cloudScrollXLock = Convert.ToBoolean(result["cloud_scroll_x_lock"]); | ||
801 | nWP.cloudScrollY = Convert.ToSingle(result["cloud_scroll_y"]); | ||
802 | nWP.cloudScrollYLock = Convert.ToBoolean(result["cloud_scroll_y_lock"]); | ||
803 | nWP.drawClassicClouds = Convert.ToBoolean(result["draw_classic_clouds"]); | ||
804 | } | ||
805 | } | ||
806 | } | ||
807 | return nWP; | ||
808 | } | ||
809 | |||
714 | public RegionSettings LoadRegionSettings(UUID regionUUID) | 810 | public RegionSettings LoadRegionSettings(UUID regionUUID) |
715 | { | 811 | { |
716 | RegionSettings rs = null; | 812 | RegionSettings rs = null; |
@@ -749,6 +845,109 @@ namespace OpenSim.Data.MySQL | |||
749 | return rs; | 845 | return rs; |
750 | } | 846 | } |
751 | 847 | ||
848 | public void StoreRegionWindlightSettings(RegionLightShareData wl) | ||
849 | { | ||
850 | using (MySqlConnection dbcon = new MySqlConnection(m_connectionString)) | ||
851 | { | ||
852 | dbcon.Open(); | ||
853 | |||
854 | using (MySqlCommand cmd = dbcon.CreateCommand()) | ||
855 | { | ||
856 | cmd.CommandText = "REPLACE INTO `regionwindlight` (`region_id`, `water_color_r`, `water_color_g`, "; | ||
857 | cmd.CommandText += "`water_color_b`, `water_fog_density_exponent`, `underwater_fog_modifier`, "; | ||
858 | cmd.CommandText += "`reflection_wavelet_scale_1`, `reflection_wavelet_scale_2`, `reflection_wavelet_scale_3`, "; | ||
859 | cmd.CommandText += "`fresnel_scale`, `fresnel_offset`, `refract_scale_above`, `refract_scale_below`, "; | ||
860 | cmd.CommandText += "`blur_multiplier`, `big_wave_direction_x`, `big_wave_direction_y`, `little_wave_direction_x`, "; | ||
861 | cmd.CommandText += "`little_wave_direction_y`, `normal_map_texture`, `horizon_r`, `horizon_g`, `horizon_b`, "; | ||
862 | cmd.CommandText += "`horizon_i`, `haze_horizon`, `blue_density_r`, `blue_density_g`, `blue_density_b`, "; | ||
863 | cmd.CommandText += "`blue_density_i`, `haze_density`, `density_multiplier`, `distance_multiplier`, `max_altitude`, "; | ||
864 | cmd.CommandText += "`sun_moon_color_r`, `sun_moon_color_g`, `sun_moon_color_b`, `sun_moon_color_i`, `sun_moon_position`, "; | ||
865 | cmd.CommandText += "`ambient_r`, `ambient_g`, `ambient_b`, `ambient_i`, `east_angle`, `sun_glow_focus`, `sun_glow_size`, "; | ||
866 | cmd.CommandText += "`scene_gamma`, `star_brightness`, `cloud_color_r`, `cloud_color_g`, `cloud_color_b`, `cloud_color_i`, "; | ||
867 | cmd.CommandText += "`cloud_x`, `cloud_y`, `cloud_density`, `cloud_coverage`, `cloud_scale`, `cloud_detail_x`, "; | ||
868 | cmd.CommandText += "`cloud_detail_y`, `cloud_detail_density`, `cloud_scroll_x`, `cloud_scroll_x_lock`, `cloud_scroll_y`, "; | ||
869 | cmd.CommandText += "`cloud_scroll_y_lock`, `draw_classic_clouds`) VALUES (?region_id, ?water_color_r, "; | ||
870 | cmd.CommandText += "?water_color_g, ?water_color_b, ?water_fog_density_exponent, ?underwater_fog_modifier, ?reflection_wavelet_scale_1, "; | ||
871 | cmd.CommandText += "?reflection_wavelet_scale_2, ?reflection_wavelet_scale_3, ?fresnel_scale, ?fresnel_offset, ?refract_scale_above, "; | ||
872 | cmd.CommandText += "?refract_scale_below, ?blur_multiplier, ?big_wave_direction_x, ?big_wave_direction_y, ?little_wave_direction_x, "; | ||
873 | cmd.CommandText += "?little_wave_direction_y, ?normal_map_texture, ?horizon_r, ?horizon_g, ?horizon_b, ?horizon_i, ?haze_horizon, "; | ||
874 | cmd.CommandText += "?blue_density_r, ?blue_density_g, ?blue_density_b, ?blue_density_i, ?haze_density, ?density_multiplier, "; | ||
875 | cmd.CommandText += "?distance_multiplier, ?max_altitude, ?sun_moon_color_r, ?sun_moon_color_g, ?sun_moon_color_b, "; | ||
876 | cmd.CommandText += "?sun_moon_color_i, ?sun_moon_position, ?ambient_r, ?ambient_g, ?ambient_b, ?ambient_i, ?east_angle, "; | ||
877 | cmd.CommandText += "?sun_glow_focus, ?sun_glow_size, ?scene_gamma, ?star_brightness, ?cloud_color_r, ?cloud_color_g, "; | ||
878 | cmd.CommandText += "?cloud_color_b, ?cloud_color_i, ?cloud_x, ?cloud_y, ?cloud_density, ?cloud_coverage, ?cloud_scale, "; | ||
879 | cmd.CommandText += "?cloud_detail_x, ?cloud_detail_y, ?cloud_detail_density, ?cloud_scroll_x, ?cloud_scroll_x_lock, "; | ||
880 | cmd.CommandText += "?cloud_scroll_y, ?cloud_scroll_y_lock, ?draw_classic_clouds)"; | ||
881 | |||
882 | cmd.Parameters.AddWithValue("region_id", wl.regionID); | ||
883 | cmd.Parameters.AddWithValue("water_color_r", wl.waterColor.X); | ||
884 | cmd.Parameters.AddWithValue("water_color_g", wl.waterColor.Y); | ||
885 | cmd.Parameters.AddWithValue("water_color_b", wl.waterColor.Z); | ||
886 | cmd.Parameters.AddWithValue("water_fog_density_exponent", wl.waterFogDensityExponent); | ||
887 | cmd.Parameters.AddWithValue("underwater_fog_modifier", wl.underwaterFogModifier); | ||
888 | cmd.Parameters.AddWithValue("reflection_wavelet_scale_1", wl.reflectionWaveletScale.X); | ||
889 | cmd.Parameters.AddWithValue("reflection_wavelet_scale_2", wl.reflectionWaveletScale.Y); | ||
890 | cmd.Parameters.AddWithValue("reflection_wavelet_scale_3", wl.reflectionWaveletScale.Z); | ||
891 | cmd.Parameters.AddWithValue("fresnel_scale", wl.fresnelScale); | ||
892 | cmd.Parameters.AddWithValue("fresnel_offset", wl.fresnelOffset); | ||
893 | cmd.Parameters.AddWithValue("refract_scale_above", wl.refractScaleAbove); | ||
894 | cmd.Parameters.AddWithValue("refract_scale_below", wl.refractScaleBelow); | ||
895 | cmd.Parameters.AddWithValue("blur_multiplier", wl.blurMultiplier); | ||
896 | cmd.Parameters.AddWithValue("big_wave_direction_x", wl.bigWaveDirection.X); | ||
897 | cmd.Parameters.AddWithValue("big_wave_direction_y", wl.bigWaveDirection.Y); | ||
898 | cmd.Parameters.AddWithValue("little_wave_direction_x", wl.littleWaveDirection.X); | ||
899 | cmd.Parameters.AddWithValue("little_wave_direction_y", wl.littleWaveDirection.Y); | ||
900 | cmd.Parameters.AddWithValue("normal_map_texture", wl.normalMapTexture); | ||
901 | cmd.Parameters.AddWithValue("horizon_r", wl.horizon.X); | ||
902 | cmd.Parameters.AddWithValue("horizon_g", wl.horizon.Y); | ||
903 | cmd.Parameters.AddWithValue("horizon_b", wl.horizon.Z); | ||
904 | cmd.Parameters.AddWithValue("horizon_i", wl.horizon.W); | ||
905 | cmd.Parameters.AddWithValue("haze_horizon", wl.hazeHorizon); | ||
906 | cmd.Parameters.AddWithValue("blue_density_r", wl.blueDensity.X); | ||
907 | cmd.Parameters.AddWithValue("blue_density_g", wl.blueDensity.Y); | ||
908 | cmd.Parameters.AddWithValue("blue_density_b", wl.blueDensity.Z); | ||
909 | cmd.Parameters.AddWithValue("blue_density_i", wl.blueDensity.W); | ||
910 | cmd.Parameters.AddWithValue("haze_density", wl.hazeDensity); | ||
911 | cmd.Parameters.AddWithValue("density_multiplier", wl.densityMultiplier); | ||
912 | cmd.Parameters.AddWithValue("distance_multiplier", wl.distanceMultiplier); | ||
913 | cmd.Parameters.AddWithValue("max_altitude", wl.maxAltitude); | ||
914 | cmd.Parameters.AddWithValue("sun_moon_color_r", wl.sunMoonColor.X); | ||
915 | cmd.Parameters.AddWithValue("sun_moon_color_g", wl.sunMoonColor.Y); | ||
916 | cmd.Parameters.AddWithValue("sun_moon_color_b", wl.sunMoonColor.Z); | ||
917 | cmd.Parameters.AddWithValue("sun_moon_color_i", wl.sunMoonColor.W); | ||
918 | cmd.Parameters.AddWithValue("sun_moon_position", wl.sunMoonPosition); | ||
919 | cmd.Parameters.AddWithValue("ambient_r", wl.ambient.X); | ||
920 | cmd.Parameters.AddWithValue("ambient_g", wl.ambient.Y); | ||
921 | cmd.Parameters.AddWithValue("ambient_b", wl.ambient.Z); | ||
922 | cmd.Parameters.AddWithValue("ambient_i", wl.ambient.W); | ||
923 | cmd.Parameters.AddWithValue("east_angle", wl.eastAngle); | ||
924 | cmd.Parameters.AddWithValue("sun_glow_focus", wl.sunGlowFocus); | ||
925 | cmd.Parameters.AddWithValue("sun_glow_size", wl.sunGlowSize); | ||
926 | cmd.Parameters.AddWithValue("scene_gamma", wl.sceneGamma); | ||
927 | cmd.Parameters.AddWithValue("star_brightness", wl.starBrightness); | ||
928 | cmd.Parameters.AddWithValue("cloud_color_r", wl.cloudColor.X); | ||
929 | cmd.Parameters.AddWithValue("cloud_color_g", wl.cloudColor.Y); | ||
930 | cmd.Parameters.AddWithValue("cloud_color_b", wl.cloudColor.Z); | ||
931 | cmd.Parameters.AddWithValue("cloud_color_i", wl.cloudColor.W); | ||
932 | cmd.Parameters.AddWithValue("cloud_x", wl.cloudXYDensity.X); | ||
933 | cmd.Parameters.AddWithValue("cloud_y", wl.cloudXYDensity.Y); | ||
934 | cmd.Parameters.AddWithValue("cloud_density", wl.cloudXYDensity.Z); | ||
935 | cmd.Parameters.AddWithValue("cloud_coverage", wl.cloudCoverage); | ||
936 | cmd.Parameters.AddWithValue("cloud_scale", wl.cloudScale); | ||
937 | cmd.Parameters.AddWithValue("cloud_detail_x", wl.cloudDetailXYDensity.X); | ||
938 | cmd.Parameters.AddWithValue("cloud_detail_y", wl.cloudDetailXYDensity.Y); | ||
939 | cmd.Parameters.AddWithValue("cloud_detail_density", wl.cloudDetailXYDensity.Z); | ||
940 | cmd.Parameters.AddWithValue("cloud_scroll_x", wl.cloudScrollX); | ||
941 | cmd.Parameters.AddWithValue("cloud_scroll_x_lock", wl.cloudScrollXLock); | ||
942 | cmd.Parameters.AddWithValue("cloud_scroll_y", wl.cloudScrollY); | ||
943 | cmd.Parameters.AddWithValue("cloud_scroll_y_lock", wl.cloudScrollYLock); | ||
944 | cmd.Parameters.AddWithValue("draw_classic_clouds", wl.drawClassicClouds); | ||
945 | |||
946 | ExecuteNonQuery(cmd); | ||
947 | } | ||
948 | } | ||
949 | } | ||
950 | |||
752 | public void StoreRegionSettings(RegionSettings rs) | 951 | public void StoreRegionSettings(RegionSettings rs) |
753 | { | 952 | { |
754 | lock (m_dbLock) | 953 | lock (m_dbLock) |
diff --git a/OpenSim/Data/Null/NullDataStore.cs b/OpenSim/Data/Null/NullDataStore.cs index 427fa0a..3ba44bb 100644 --- a/OpenSim/Data/Null/NullDataStore.cs +++ b/OpenSim/Data/Null/NullDataStore.cs | |||
@@ -50,7 +50,16 @@ namespace OpenSim.Data.Null | |||
50 | public void StoreRegionSettings(RegionSettings rs) | 50 | public void StoreRegionSettings(RegionSettings rs) |
51 | { | 51 | { |
52 | } | 52 | } |
53 | 53 | public RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID) | |
54 | { | ||
55 | //This connector doesn't support the windlight module yet | ||
56 | //Return default LL windlight settings | ||
57 | return new RegionLightShareData(); | ||
58 | } | ||
59 | public void StoreRegionWindlightSettings(RegionLightShareData wl) | ||
60 | { | ||
61 | //This connector doesn't support the windlight module yet | ||
62 | } | ||
54 | public RegionSettings LoadRegionSettings(UUID regionUUID) | 63 | public RegionSettings LoadRegionSettings(UUID regionUUID) |
55 | { | 64 | { |
56 | return null; | 65 | return null; |
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs index 5a4ee2a..d2ba9ae 100644 --- a/OpenSim/Data/SQLite/SQLiteRegionData.cs +++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs | |||
@@ -272,7 +272,16 @@ namespace OpenSim.Data.SQLite | |||
272 | Commit(); | 272 | Commit(); |
273 | } | 273 | } |
274 | } | 274 | } |
275 | 275 | public RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID) | |
276 | { | ||
277 | //This connector doesn't support the windlight module yet | ||
278 | //Return default LL windlight settings | ||
279 | return new RegionLightShareData(); | ||
280 | } | ||
281 | public void StoreRegionWindlightSettings(RegionLightShareData wl) | ||
282 | { | ||
283 | //This connector doesn't support the windlight module yet | ||
284 | } | ||
276 | public RegionSettings LoadRegionSettings(UUID regionUUID) | 285 | public RegionSettings LoadRegionSettings(UUID regionUUID) |
277 | { | 286 | { |
278 | lock (ds) | 287 | lock (ds) |
@@ -320,7 +329,7 @@ namespace OpenSim.Data.SQLite | |||
320 | { | 329 | { |
321 | foreach (SceneObjectPart prim in obj.Children.Values) | 330 | foreach (SceneObjectPart prim in obj.Children.Values) |
322 | { | 331 | { |
323 | m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID); | 332 | // m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID); |
324 | addPrim(prim, obj.UUID, regionUUID); | 333 | addPrim(prim, obj.UUID, regionUUID); |
325 | } | 334 | } |
326 | } | 335 | } |
diff --git a/OpenSim/Framework/Communications/Osp/OspResolver.cs b/OpenSim/Framework/Communications/Osp/OspResolver.cs index 2e55f53..24ea64d 100644 --- a/OpenSim/Framework/Communications/Osp/OspResolver.cs +++ b/OpenSim/Framework/Communications/Osp/OspResolver.cs | |||
@@ -139,6 +139,9 @@ namespace OpenSim.Framework.Communications.Osp | |||
139 | /// </returns> | 139 | /// </returns> |
140 | protected static UUID ResolveOspaName(string name, IUserAccountService userService) | 140 | protected static UUID ResolveOspaName(string name, IUserAccountService userService) |
141 | { | 141 | { |
142 | if (userService == null) | ||
143 | return UUID.Zero; | ||
144 | |||
142 | int nameSeparatorIndex = name.IndexOf(OSPA_NAME_VALUE_SEPARATOR); | 145 | int nameSeparatorIndex = name.IndexOf(OSPA_NAME_VALUE_SEPARATOR); |
143 | 146 | ||
144 | if (nameSeparatorIndex < 0) | 147 | if (nameSeparatorIndex < 0) |
@@ -149,7 +152,7 @@ namespace OpenSim.Framework.Communications.Osp | |||
149 | 152 | ||
150 | string firstName = name.Remove(nameSeparatorIndex).TrimEnd(); | 153 | string firstName = name.Remove(nameSeparatorIndex).TrimEnd(); |
151 | string lastName = name.Substring(nameSeparatorIndex + 1).TrimStart(); | 154 | string lastName = name.Substring(nameSeparatorIndex + 1).TrimStart(); |
152 | 155 | ||
153 | UserAccount account = userService.GetUserAccount(UUID.Zero, firstName, lastName); | 156 | UserAccount account = userService.GetUserAccount(UUID.Zero, firstName, lastName); |
154 | if (account != null) | 157 | if (account != null) |
155 | return account.PrincipalID; | 158 | return account.PrincipalID; |
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 4f6f709..4577758 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -1150,7 +1150,7 @@ namespace OpenSim.Framework | |||
1150 | 1150 | ||
1151 | void SendInstantMessage(GridInstantMessage im); | 1151 | void SendInstantMessage(GridInstantMessage im); |
1152 | 1152 | ||
1153 | void SendGenericMessage(string method, List<string> message); | 1153 | void SendGenericMessage(string method, List<byte[]> message); |
1154 | 1154 | ||
1155 | void SendLayerData(float[] map); | 1155 | void SendLayerData(float[] map); |
1156 | void SendLayerData(int px, int py, float[] map); | 1156 | void SendLayerData(int px, int py, float[] map); |
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index 5d63da7..ad98816 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs | |||
@@ -36,8 +36,295 @@ using OpenMetaverse; | |||
36 | using OpenMetaverse.StructuredData; | 36 | using OpenMetaverse.StructuredData; |
37 | using OpenSim.Framework.Console; | 37 | using OpenSim.Framework.Console; |
38 | 38 | ||
39 | |||
39 | namespace OpenSim.Framework | 40 | namespace OpenSim.Framework |
40 | { | 41 | { |
42 | public class RegionLightShareData : ICloneable | ||
43 | { | ||
44 | public UUID regionID = UUID.Zero; | ||
45 | public Vector3 waterColor = new Vector3(4.0f,38.0f,64.0f); | ||
46 | public float waterFogDensityExponent = 4.0f; | ||
47 | public float underwaterFogModifier = 0.25f; | ||
48 | public Vector3 reflectionWaveletScale = new Vector3(2.0f,2.0f,2.0f); | ||
49 | public float fresnelScale = 0.40f; | ||
50 | public float fresnelOffset = 0.50f; | ||
51 | public float refractScaleAbove = 0.03f; | ||
52 | public float refractScaleBelow = 0.20f; | ||
53 | public float blurMultiplier = 0.040f; | ||
54 | public Vector2 bigWaveDirection = new Vector2(1.05f,-0.42f); | ||
55 | public Vector2 littleWaveDirection = new Vector2(1.11f,-1.16f); | ||
56 | public UUID normalMapTexture = new UUID("822ded49-9a6c-f61c-cb89-6df54f42cdf4"); | ||
57 | public Vector4 horizon = new Vector4(0.25f, 0.25f, 0.32f, 0.32f); | ||
58 | public float hazeHorizon = 0.19f; | ||
59 | public Vector4 blueDensity = new Vector4(0.12f, 0.22f, 0.38f, 0.38f); | ||
60 | public float hazeDensity = 0.70f; | ||
61 | public float densityMultiplier = 0.18f; | ||
62 | public float distanceMultiplier = 0.8f; | ||
63 | public UInt16 maxAltitude = 1605; | ||
64 | public Vector4 sunMoonColor = new Vector4(0.24f, 0.26f, 0.30f, 0.30f); | ||
65 | public float sunMoonPosition = 0.317f; | ||
66 | public Vector4 ambient = new Vector4(0.35f,0.35f,0.35f,0.35f); | ||
67 | public float eastAngle = 0.0f; | ||
68 | public float sunGlowFocus = 0.10f; | ||
69 | public float sunGlowSize = 1.75f; | ||
70 | public float sceneGamma = 1.0f; | ||
71 | public float starBrightness = 0.0f; | ||
72 | public Vector4 cloudColor = new Vector4(0.41f, 0.41f, 0.41f, 0.41f); | ||
73 | public Vector3 cloudXYDensity = new Vector3(1.00f, 0.53f, 1.00f); | ||
74 | public float cloudCoverage = 0.27f; | ||
75 | public float cloudScale = 0.42f; | ||
76 | public Vector3 cloudDetailXYDensity = new Vector3(1.00f, 0.53f, 0.12f); | ||
77 | public float cloudScrollX = 0.20f; | ||
78 | public bool cloudScrollXLock = false; | ||
79 | public float cloudScrollY = 0.01f; | ||
80 | public bool cloudScrollYLock = false; | ||
81 | public bool drawClassicClouds = true; | ||
82 | |||
83 | public delegate void SaveDelegate(RegionLightShareData wl); | ||
84 | public event SaveDelegate OnSave; | ||
85 | public void Save() | ||
86 | { | ||
87 | if (OnSave != null) | ||
88 | OnSave(this); | ||
89 | } | ||
90 | public object Clone() | ||
91 | { | ||
92 | return this.MemberwiseClone(); // call clone method | ||
93 | } | ||
94 | |||
95 | } | ||
96 | |||
97 | [Serializable] | ||
98 | public class SimpleRegionInfo | ||
99 | { | ||
100 | // private static readonly log4net.ILog m_log | ||
101 | // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | ||
102 | |||
103 | /// <summary> | ||
104 | /// The port by which http communication occurs with the region (most noticeably, CAPS communication) | ||
105 | /// </summary> | ||
106 | public uint HttpPort | ||
107 | { | ||
108 | get { return m_httpPort; } | ||
109 | set { m_httpPort = value; } | ||
110 | } | ||
111 | protected uint m_httpPort; | ||
112 | |||
113 | /// <summary> | ||
114 | /// A well-formed URI for the host region server (namely "http://" + ExternalHostName) | ||
115 | /// </summary> | ||
116 | public string ServerURI | ||
117 | { | ||
118 | get { return m_serverURI; } | ||
119 | set { m_serverURI = value; } | ||
120 | } | ||
121 | protected string m_serverURI; | ||
122 | |||
123 | public string RegionName | ||
124 | { | ||
125 | get { return m_regionName; } | ||
126 | set { m_regionName = value; } | ||
127 | } | ||
128 | protected string m_regionName = String.Empty; | ||
129 | |||
130 | protected bool Allow_Alternate_Ports; | ||
131 | public bool m_allow_alternate_ports; | ||
132 | protected string m_externalHostName; | ||
133 | |||
134 | protected IPEndPoint m_internalEndPoint; | ||
135 | protected uint? m_regionLocX; | ||
136 | protected uint? m_regionLocY; | ||
137 | protected uint m_remotingPort; | ||
138 | public UUID RegionID = UUID.Zero; | ||
139 | public string RemotingAddress; | ||
140 | public UUID ScopeID = UUID.Zero; | ||
141 | |||
142 | public SimpleRegionInfo() | ||
143 | { | ||
144 | } | ||
145 | |||
146 | public SimpleRegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri) | ||
147 | { | ||
148 | m_regionLocX = regionLocX; | ||
149 | m_regionLocY = regionLocY; | ||
150 | |||
151 | m_internalEndPoint = internalEndPoint; | ||
152 | m_externalHostName = externalUri; | ||
153 | } | ||
154 | |||
155 | public SimpleRegionInfo(uint regionLocX, uint regionLocY, string externalUri, uint port) | ||
156 | { | ||
157 | m_regionLocX = regionLocX; | ||
158 | m_regionLocY = regionLocY; | ||
159 | |||
160 | m_externalHostName = externalUri; | ||
161 | |||
162 | m_internalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), (int) port); | ||
163 | } | ||
164 | |||
165 | public SimpleRegionInfo(RegionInfo ConvertFrom) | ||
166 | { | ||
167 | m_regionName = ConvertFrom.RegionName; | ||
168 | m_regionLocX = ConvertFrom.RegionLocX; | ||
169 | m_regionLocY = ConvertFrom.RegionLocY; | ||
170 | m_internalEndPoint = ConvertFrom.InternalEndPoint; | ||
171 | m_externalHostName = ConvertFrom.ExternalHostName; | ||
172 | m_remotingPort = ConvertFrom.RemotingPort; | ||
173 | m_httpPort = ConvertFrom.HttpPort; | ||
174 | m_allow_alternate_ports = ConvertFrom.m_allow_alternate_ports; | ||
175 | RemotingAddress = ConvertFrom.RemotingAddress; | ||
176 | RegionID = UUID.Zero; | ||
177 | ServerURI = ConvertFrom.ServerURI; | ||
178 | } | ||
179 | |||
180 | public uint RemotingPort | ||
181 | { | ||
182 | get { return m_remotingPort; } | ||
183 | set { m_remotingPort = value; } | ||
184 | } | ||
185 | |||
186 | /// <value> | ||
187 | /// This accessor can throw all the exceptions that Dns.GetHostAddresses can throw. | ||
188 | /// | ||
189 | /// XXX Isn't this really doing too much to be a simple getter, rather than an explict method? | ||
190 | /// </value> | ||
191 | public IPEndPoint ExternalEndPoint | ||
192 | { | ||
193 | get | ||
194 | { | ||
195 | // Old one defaults to IPv6 | ||
196 | //return new IPEndPoint(Dns.GetHostAddresses(m_externalHostName)[0], m_internalEndPoint.Port); | ||
197 | |||
198 | IPAddress ia = null; | ||
199 | // If it is already an IP, don't resolve it - just return directly | ||
200 | if (IPAddress.TryParse(m_externalHostName, out ia)) | ||
201 | return new IPEndPoint(ia, m_internalEndPoint.Port); | ||
202 | |||
203 | // Reset for next check | ||
204 | ia = null; | ||
205 | try | ||
206 | { | ||
207 | foreach (IPAddress Adr in Dns.GetHostAddresses(m_externalHostName)) | ||
208 | { | ||
209 | if (ia == null) | ||
210 | ia = Adr; | ||
211 | |||
212 | if (Adr.AddressFamily == AddressFamily.InterNetwork) | ||
213 | { | ||
214 | ia = Adr; | ||
215 | break; | ||
216 | } | ||
217 | } | ||
218 | } | ||
219 | catch (SocketException e) | ||
220 | { | ||
221 | throw new Exception( | ||
222 | "Unable to resolve local hostname " + m_externalHostName + " innerException of type '" + | ||
223 | e + "' attached to this exception", e); | ||
224 | } | ||
225 | |||
226 | return new IPEndPoint(ia, m_internalEndPoint.Port); | ||
227 | } | ||
228 | |||
229 | set { m_externalHostName = value.ToString(); } | ||
230 | } | ||
231 | |||
232 | public string ExternalHostName | ||
233 | { | ||
234 | get { return m_externalHostName; } | ||
235 | set { m_externalHostName = value; } | ||
236 | } | ||
237 | |||
238 | public IPEndPoint InternalEndPoint | ||
239 | { | ||
240 | get { return m_internalEndPoint; } | ||
241 | set { m_internalEndPoint = value; } | ||
242 | } | ||
243 | |||
244 | public uint RegionLocX | ||
245 | { | ||
246 | get { return m_regionLocX.Value; } | ||
247 | set { m_regionLocX = value; } | ||
248 | } | ||
249 | |||
250 | public uint RegionLocY | ||
251 | { | ||
252 | get { return m_regionLocY.Value; } | ||
253 | set { m_regionLocY = value; } | ||
254 | } | ||
255 | |||
256 | public ulong RegionHandle | ||
257 | { | ||
258 | get { return Util.UIntsToLong((RegionLocX * (uint) Constants.RegionSize), (RegionLocY * (uint) Constants.RegionSize)); } | ||
259 | } | ||
260 | |||
261 | public int getInternalEndPointPort() | ||
262 | { | ||
263 | return m_internalEndPoint.Port; | ||
264 | } | ||
265 | |||
266 | public Dictionary<string, object> ToKeyValuePairs() | ||
267 | { | ||
268 | Dictionary<string, object> kvp = new Dictionary<string, object>(); | ||
269 | kvp["uuid"] = RegionID.ToString(); | ||
270 | kvp["locX"] = RegionLocX.ToString(); | ||
271 | kvp["locY"] = RegionLocY.ToString(); | ||
272 | kvp["external_ip_address"] = ExternalEndPoint.Address.ToString(); | ||
273 | kvp["external_port"] = ExternalEndPoint.Port.ToString(); | ||
274 | kvp["external_host_name"] = ExternalHostName; | ||
275 | kvp["http_port"] = HttpPort.ToString(); | ||
276 | kvp["internal_ip_address"] = InternalEndPoint.Address.ToString(); | ||
277 | kvp["internal_port"] = InternalEndPoint.Port.ToString(); | ||
278 | kvp["alternate_ports"] = m_allow_alternate_ports.ToString(); | ||
279 | kvp["server_uri"] = ServerURI; | ||
280 | |||
281 | return kvp; | ||
282 | } | ||
283 | |||
284 | public SimpleRegionInfo(Dictionary<string, object> kvp) | ||
285 | { | ||
286 | if ((kvp["external_ip_address"] != null) && (kvp["external_port"] != null)) | ||
287 | { | ||
288 | int port = 0; | ||
289 | Int32.TryParse((string)kvp["external_port"], out port); | ||
290 | IPEndPoint ep = new IPEndPoint(IPAddress.Parse((string)kvp["external_ip_address"]), port); | ||
291 | ExternalEndPoint = ep; | ||
292 | } | ||
293 | else | ||
294 | ExternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0); | ||
295 | |||
296 | if (kvp["external_host_name"] != null) | ||
297 | ExternalHostName = (string)kvp["external_host_name"]; | ||
298 | |||
299 | if (kvp["http_port"] != null) | ||
300 | { | ||
301 | UInt32 port = 0; | ||
302 | UInt32.TryParse((string)kvp["http_port"], out port); | ||
303 | HttpPort = port; | ||
304 | } | ||
305 | |||
306 | if ((kvp["internal_ip_address"] != null) && (kvp["internal_port"] != null)) | ||
307 | { | ||
308 | int port = 0; | ||
309 | Int32.TryParse((string)kvp["internal_port"], out port); | ||
310 | IPEndPoint ep = new IPEndPoint(IPAddress.Parse((string)kvp["internal_ip_address"]), port); | ||
311 | InternalEndPoint = ep; | ||
312 | } | ||
313 | else | ||
314 | InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0); | ||
315 | |||
316 | if (kvp["alternate_ports"] != null) | ||
317 | { | ||
318 | bool alts = false; | ||
319 | Boolean.TryParse((string)kvp["alternate_ports"], out alts); | ||
320 | m_allow_alternate_ports = alts; | ||
321 | } | ||
322 | |||
323 | if (kvp["server_uri"] != null) | ||
324 | ServerURI = (string)kvp["server_uri"]; | ||
325 | } | ||
326 | } | ||
327 | |||
41 | public class RegionInfo | 328 | public class RegionInfo |
42 | { | 329 | { |
43 | // private static readonly log4net.ILog m_log | 330 | // private static readonly log4net.ILog m_log |
@@ -69,6 +356,7 @@ namespace OpenSim.Framework | |||
69 | private bool m_clampPrimSize = false; | 356 | private bool m_clampPrimSize = false; |
70 | private int m_objectCapacity = 0; | 357 | private int m_objectCapacity = 0; |
71 | private string m_regionType = String.Empty; | 358 | private string m_regionType = String.Empty; |
359 | private RegionLightShareData m_windlight = new RegionLightShareData(); | ||
72 | protected uint m_httpPort; | 360 | protected uint m_httpPort; |
73 | protected string m_serverURI; | 361 | protected string m_serverURI; |
74 | protected string m_regionName = String.Empty; | 362 | protected string m_regionName = String.Empty; |
@@ -207,6 +495,21 @@ namespace OpenSim.Framework | |||
207 | set { m_regionSettings = value; } | 495 | set { m_regionSettings = value; } |
208 | } | 496 | } |
209 | 497 | ||
498 | public RegionLightShareData WindlightSettings | ||
499 | { | ||
500 | get | ||
501 | { | ||
502 | if (m_windlight == null) | ||
503 | { | ||
504 | m_windlight = new RegionLightShareData(); | ||
505 | } | ||
506 | |||
507 | return m_windlight; | ||
508 | } | ||
509 | |||
510 | set { m_windlight = value; } | ||
511 | } | ||
512 | |||
210 | public int NonphysPrimMax | 513 | public int NonphysPrimMax |
211 | { | 514 | { |
212 | get { return m_nonphysPrimMax; } | 515 | get { return m_nonphysPrimMax; } |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 9ba99d6..25f6ef0 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -845,17 +845,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
845 | } | 845 | } |
846 | } | 846 | } |
847 | 847 | ||
848 | public void SendGenericMessage(string method, List<string> message) | 848 | public void SendGenericMessage(string method, List<byte[]> message) |
849 | { | 849 | { |
850 | GenericMessagePacket gmp = new GenericMessagePacket(); | 850 | GenericMessagePacket gmp = new GenericMessagePacket(); |
851 | gmp.MethodData.Method = Util.StringToBytes256(method); | 851 | gmp.MethodData.Method = Util.StringToBytes256(method); |
852 | gmp.ParamList = new GenericMessagePacket.ParamListBlock[message.Count]; | 852 | gmp.ParamList = new GenericMessagePacket.ParamListBlock[message.Count]; |
853 | int i = 0; | 853 | int i = 0; |
854 | foreach (string val in message) | 854 | foreach (byte[] val in message) |
855 | { | 855 | { |
856 | gmp.ParamList[i] = new GenericMessagePacket.ParamListBlock(); | 856 | gmp.ParamList[i] = new GenericMessagePacket.ParamListBlock(); |
857 | gmp.ParamList[i++].Parameter = Util.StringToBytes256(val); | 857 | gmp.ParamList[i++].Parameter = val; |
858 | } | 858 | } |
859 | |||
859 | OutPacket(gmp, ThrottleOutPacketType.Task); | 860 | OutPacket(gmp, ThrottleOutPacketType.Task); |
860 | } | 861 | } |
861 | 862 | ||
diff --git a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs index e37da9f..36dae6b 100644 --- a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs +++ b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs | |||
@@ -173,11 +173,11 @@ namespace OpenSim.Region.CoreModules.Framework.Library | |||
173 | m_log.InfoFormat("[LIBRARY MODULE]: Loading library archive {0} ({1})...", iarFileName, simpleName); | 173 | m_log.InfoFormat("[LIBRARY MODULE]: Loading library archive {0} ({1})...", iarFileName, simpleName); |
174 | simpleName = GetInventoryPathFromName(simpleName); | 174 | simpleName = GetInventoryPathFromName(simpleName); |
175 | 175 | ||
176 | InventoryArchiveReadRequest archread = new InventoryArchiveReadRequest(m_MockScene, uinfo, simpleName, iarFileName); | ||
176 | try | 177 | try |
177 | { | 178 | { |
178 | InventoryArchiveReadRequest archread = new InventoryArchiveReadRequest(m_MockScene, uinfo, simpleName, iarFileName); | ||
179 | List<InventoryNodeBase> nodes = archread.Execute(); | 179 | List<InventoryNodeBase> nodes = archread.Execute(); |
180 | if (nodes.Count == 0) | 180 | if (nodes != null && nodes.Count == 0) |
181 | { | 181 | { |
182 | // didn't find the subfolder with the given name; place it on the top | 182 | // didn't find the subfolder with the given name; place it on the top |
183 | m_log.InfoFormat("[LIBRARY MODULE]: Didn't find {0} in library. Placing archive on the top level", simpleName); | 183 | m_log.InfoFormat("[LIBRARY MODULE]: Didn't find {0} in library. Placing archive on the top level", simpleName); |
@@ -185,16 +185,33 @@ namespace OpenSim.Region.CoreModules.Framework.Library | |||
185 | archread = new InventoryArchiveReadRequest(m_MockScene, uinfo, "/", iarFileName); | 185 | archread = new InventoryArchiveReadRequest(m_MockScene, uinfo, "/", iarFileName); |
186 | archread.Execute(); | 186 | archread.Execute(); |
187 | } | 187 | } |
188 | archread.Close(); | 188 | foreach (InventoryNodeBase node in nodes) |
189 | FixPerms(node); | ||
189 | } | 190 | } |
190 | catch (Exception e) | 191 | catch (Exception e) |
191 | { | 192 | { |
192 | m_log.DebugFormat("[LIBRARY MODULE]: Exception when processing archive {0}: {1}", iarFileName, e.Message); | 193 | m_log.DebugFormat("[LIBRARY MODULE]: Exception when processing archive {0}: {1}", iarFileName, e.StackTrace); |
194 | } | ||
195 | finally | ||
196 | { | ||
197 | archread.Close(); | ||
193 | } | 198 | } |
194 | } | 199 | } |
195 | 200 | ||
196 | } | 201 | } |
197 | 202 | ||
203 | private void FixPerms(InventoryNodeBase node) | ||
204 | { | ||
205 | if (node is InventoryItemBase) | ||
206 | { | ||
207 | InventoryItemBase item = (InventoryItemBase)node; | ||
208 | item.BasePermissions = 0x7FFFFFFF; | ||
209 | item.EveryOnePermissions = 0x7FFFFFFF; | ||
210 | item.CurrentPermissions = 0x7FFFFFFF; | ||
211 | item.NextPermissions = 0x7FFFFFFF; | ||
212 | } | ||
213 | } | ||
214 | |||
198 | private void DumpLibrary() | 215 | private void DumpLibrary() |
199 | { | 216 | { |
200 | InventoryFolderImpl lib = m_Library.LibraryRootFolder; | 217 | InventoryFolderImpl lib = m_Library.LibraryRootFolder; |
diff --git a/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs b/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs new file mode 100644 index 0000000..e6cab1d --- /dev/null +++ b/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs | |||
@@ -0,0 +1,293 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.IO; | ||
31 | using System.Reflection; | ||
32 | using OpenMetaverse; | ||
33 | using log4net; | ||
34 | using Nini.Config; | ||
35 | using OpenSim.Data; | ||
36 | using OpenSim.Framework; | ||
37 | using OpenSim.Region.CoreModules.Framework.InterfaceCommander; | ||
38 | using OpenSim.Region.Framework.Interfaces; | ||
39 | using OpenSim.Region.Framework.Scenes; | ||
40 | |||
41 | |||
42 | namespace OpenSim.Region.CoreModules.World.LightShare | ||
43 | { | ||
44 | public class LightShareModule : IRegionModule, ICommandableModule | ||
45 | { | ||
46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
47 | private readonly Commander m_commander = new Commander("windlight"); | ||
48 | private Scene m_scene; | ||
49 | private static bool m_enableWindlight; | ||
50 | |||
51 | #region ICommandableModule Members | ||
52 | |||
53 | public ICommander CommandInterface | ||
54 | { | ||
55 | get { return m_commander; } | ||
56 | } | ||
57 | |||
58 | #endregion | ||
59 | |||
60 | #region IRegionModule Members | ||
61 | |||
62 | public static bool EnableWindlight | ||
63 | { | ||
64 | get | ||
65 | { | ||
66 | return m_enableWindlight; | ||
67 | } | ||
68 | set | ||
69 | { | ||
70 | } | ||
71 | } | ||
72 | |||
73 | public void Initialise(Scene scene, IConfigSource config) | ||
74 | { | ||
75 | m_scene = scene; | ||
76 | m_scene.RegisterModuleInterface<IRegionModule>(this); | ||
77 | m_scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole; | ||
78 | |||
79 | // ini file settings | ||
80 | try | ||
81 | { | ||
82 | m_enableWindlight = config.Configs["LightShare"].GetBoolean("enable_windlight", false); | ||
83 | } | ||
84 | catch (Exception) | ||
85 | { | ||
86 | m_log.Debug("[WINDLIGHT]: ini failure for enable_windlight - using default"); | ||
87 | } | ||
88 | |||
89 | if (m_enableWindlight) | ||
90 | { | ||
91 | m_scene.EventManager.OnMakeRootAgent += EventManager_OnMakeRootAgent; | ||
92 | m_scene.EventManager.OnSaveNewWindlightProfile += EventManager_OnSaveNewWindlightProfile; | ||
93 | m_scene.EventManager.OnSendNewWindlightProfileTargeted += EventManager_OnSendNewWindlightProfileTargeted; | ||
94 | } | ||
95 | |||
96 | InstallCommands(); | ||
97 | |||
98 | m_log.Debug("[WINDLIGHT]: Initialised windlight module"); | ||
99 | } | ||
100 | |||
101 | private List<byte[]> compileWindlightSettings(RegionLightShareData wl) | ||
102 | { | ||
103 | byte[] mBlock = new Byte[249]; | ||
104 | int pos = 0; | ||
105 | |||
106 | wl.waterColor.ToBytes(mBlock, 0); pos += 12; | ||
107 | Utils.FloatToBytes(wl.waterFogDensityExponent).CopyTo(mBlock, pos); pos += 4; | ||
108 | Utils.FloatToBytes(wl.underwaterFogModifier).CopyTo(mBlock, pos); pos += 4; | ||
109 | wl.reflectionWaveletScale.ToBytes(mBlock, pos); pos += 12; | ||
110 | Utils.FloatToBytes(wl.fresnelScale).CopyTo(mBlock, pos); pos += 4; | ||
111 | Utils.FloatToBytes(wl.fresnelOffset).CopyTo(mBlock, pos); pos += 4; | ||
112 | Utils.FloatToBytes(wl.refractScaleAbove).CopyTo(mBlock, pos); pos += 4; | ||
113 | Utils.FloatToBytes(wl.refractScaleBelow).CopyTo(mBlock, pos); pos += 4; | ||
114 | Utils.FloatToBytes(wl.blurMultiplier).CopyTo(mBlock, pos); pos += 4; | ||
115 | wl.bigWaveDirection.ToBytes(mBlock, pos); pos += 8; | ||
116 | wl.littleWaveDirection.ToBytes(mBlock, pos); pos += 8; | ||
117 | wl.normalMapTexture.ToBytes(mBlock, pos); pos += 16; | ||
118 | wl.horizon.ToBytes(mBlock, pos); pos += 16; | ||
119 | Utils.FloatToBytes(wl.hazeHorizon).CopyTo(mBlock, pos); pos += 4; | ||
120 | wl.blueDensity.ToBytes(mBlock, pos); pos += 16; | ||
121 | Utils.FloatToBytes(wl.hazeDensity).CopyTo(mBlock, pos); pos += 4; | ||
122 | Utils.FloatToBytes(wl.densityMultiplier).CopyTo(mBlock, pos); pos += 4; | ||
123 | Utils.FloatToBytes(wl.distanceMultiplier).CopyTo(mBlock, pos); pos += 4; | ||
124 | wl.sunMoonColor.ToBytes(mBlock, pos); pos += 16; | ||
125 | Utils.FloatToBytes(wl.sunMoonPosition).CopyTo(mBlock, pos); pos += 4; | ||
126 | wl.ambient.ToBytes(mBlock, pos); pos += 16; | ||
127 | Utils.FloatToBytes(wl.eastAngle).CopyTo(mBlock, pos); pos += 4; | ||
128 | Utils.FloatToBytes(wl.sunGlowFocus).CopyTo(mBlock, pos); pos += 4; | ||
129 | Utils.FloatToBytes(wl.sunGlowSize).CopyTo(mBlock, pos); pos += 4; | ||
130 | Utils.FloatToBytes(wl.sceneGamma).CopyTo(mBlock, pos); pos += 4; | ||
131 | Utils.FloatToBytes(wl.starBrightness).CopyTo(mBlock, pos); pos += 4; | ||
132 | wl.cloudColor.ToBytes(mBlock, pos); pos += 16; | ||
133 | wl.cloudXYDensity.ToBytes(mBlock, pos); pos += 12; | ||
134 | Utils.FloatToBytes(wl.cloudCoverage).CopyTo(mBlock, pos); pos += 4; | ||
135 | Utils.FloatToBytes(wl.cloudScale).CopyTo(mBlock, pos); pos += 4; | ||
136 | wl.cloudDetailXYDensity.ToBytes(mBlock, pos); pos += 12; | ||
137 | Utils.FloatToBytes(wl.cloudScrollX).CopyTo(mBlock, pos); pos += 4; | ||
138 | Utils.FloatToBytes(wl.cloudScrollY).CopyTo(mBlock, pos); pos += 4; | ||
139 | Utils.UInt16ToBytes(wl.maxAltitude).CopyTo(mBlock, pos); pos += 2; | ||
140 | mBlock[pos] = Convert.ToByte(wl.cloudScrollXLock); pos++; | ||
141 | mBlock[pos] = Convert.ToByte(wl.cloudScrollYLock); pos++; | ||
142 | mBlock[pos] = Convert.ToByte(wl.drawClassicClouds); pos++; | ||
143 | List<byte[]> param = new List<byte[]>(); | ||
144 | param.Add(mBlock); | ||
145 | return param; | ||
146 | } | ||
147 | public void SendProfileToClient(ScenePresence presence) | ||
148 | { | ||
149 | IClientAPI client = presence.ControllingClient; | ||
150 | if (m_enableWindlight) | ||
151 | { | ||
152 | if (presence.IsChildAgent == false) | ||
153 | { | ||
154 | List<byte[]> param = compileWindlightSettings(m_scene.RegionInfo.WindlightSettings); | ||
155 | client.SendGenericMessage("Windlight", param); | ||
156 | } | ||
157 | } | ||
158 | else | ||
159 | { | ||
160 | //We probably don't want to spam chat with this.. probably | ||
161 | //m_log.Debug("[WINDLIGHT]: Module disabled"); | ||
162 | } | ||
163 | } | ||
164 | public void SendProfileToClient(ScenePresence presence, RegionLightShareData wl) | ||
165 | { | ||
166 | IClientAPI client = presence.ControllingClient; | ||
167 | if (m_enableWindlight) | ||
168 | { | ||
169 | if (presence.IsChildAgent == false) | ||
170 | { | ||
171 | List<byte[]> param = compileWindlightSettings(wl); | ||
172 | client.SendGenericMessage("Windlight", param); | ||
173 | } | ||
174 | } | ||
175 | else | ||
176 | { | ||
177 | //We probably don't want to spam chat with this.. probably | ||
178 | //m_log.Debug("[WINDLIGHT]: Module disabled"); | ||
179 | } | ||
180 | } | ||
181 | private void EventManager_OnMakeRootAgent(ScenePresence presence) | ||
182 | { | ||
183 | m_log.Debug("[WINDLIGHT]: Sending windlight scene to new client"); | ||
184 | SendProfileToClient(presence); | ||
185 | } | ||
186 | private void EventManager_OnSendNewWindlightProfileTargeted(RegionLightShareData wl, UUID pUUID) | ||
187 | { | ||
188 | ScenePresence Sc; | ||
189 | if (m_scene.TryGetScenePresence(pUUID,out Sc)) | ||
190 | { | ||
191 | SendProfileToClient(Sc,wl); | ||
192 | } | ||
193 | } | ||
194 | private void EventManager_OnSaveNewWindlightProfile() | ||
195 | { | ||
196 | m_scene.ForEachScenePresence(SendProfileToClient); | ||
197 | } | ||
198 | |||
199 | public void PostInitialise() | ||
200 | { | ||
201 | |||
202 | } | ||
203 | |||
204 | public void Close() | ||
205 | { | ||
206 | } | ||
207 | |||
208 | public string Name | ||
209 | { | ||
210 | get { return "LightShareModule"; } | ||
211 | } | ||
212 | |||
213 | public bool IsSharedModule | ||
214 | { | ||
215 | get { return false; } | ||
216 | } | ||
217 | |||
218 | #endregion | ||
219 | |||
220 | #region events | ||
221 | |||
222 | #endregion | ||
223 | |||
224 | #region ICommandableModule Members | ||
225 | |||
226 | private void InstallCommands() | ||
227 | { | ||
228 | Command wlload = new Command("load", CommandIntentions.COMMAND_NON_HAZARDOUS, HandleLoad, "Load windlight profile from the database and broadcast"); | ||
229 | Command wlenable = new Command("enable", CommandIntentions.COMMAND_NON_HAZARDOUS, HandleEnable, "Enable the windlight plugin"); | ||
230 | Command wldisable = new Command("disable", CommandIntentions.COMMAND_NON_HAZARDOUS, HandleDisable, "Enable the windlight plugin"); | ||
231 | |||
232 | m_commander.RegisterCommand("load", wlload); | ||
233 | m_commander.RegisterCommand("enable", wlenable); | ||
234 | m_commander.RegisterCommand("disable", wldisable); | ||
235 | |||
236 | m_scene.RegisterModuleCommander(m_commander); | ||
237 | } | ||
238 | |||
239 | private void HandleLoad(Object[] args) | ||
240 | { | ||
241 | if (!m_enableWindlight) | ||
242 | { | ||
243 | m_log.InfoFormat("[WINDLIGHT]: Cannot load windlight profile, module disabled. Use 'windlight enable' first."); | ||
244 | } | ||
245 | else | ||
246 | { | ||
247 | m_log.InfoFormat("[WINDLIGHT]: Loading Windlight profile from database"); | ||
248 | m_scene.LoadWindlightProfile(); | ||
249 | m_log.InfoFormat("[WINDLIGHT]: Load complete"); | ||
250 | } | ||
251 | } | ||
252 | |||
253 | private void HandleDisable(Object[] args) | ||
254 | { | ||
255 | m_log.InfoFormat("[WINDLIGHT]: Plugin now disabled"); | ||
256 | m_enableWindlight=false; | ||
257 | } | ||
258 | |||
259 | private void HandleEnable(Object[] args) | ||
260 | { | ||
261 | m_log.InfoFormat("[WINDLIGHT]: Plugin now enabled"); | ||
262 | m_enableWindlight = true; | ||
263 | } | ||
264 | |||
265 | /// <summary> | ||
266 | /// Processes commandline input. Do not call directly. | ||
267 | /// </summary> | ||
268 | /// <param name="args">Commandline arguments</param> | ||
269 | private void EventManager_OnPluginConsole(string[] args) | ||
270 | { | ||
271 | if (args[0] == "windlight") | ||
272 | { | ||
273 | if (args.Length == 1) | ||
274 | { | ||
275 | m_commander.ProcessConsoleCommand("add", new string[0]); | ||
276 | return; | ||
277 | } | ||
278 | |||
279 | string[] tmpArgs = new string[args.Length - 2]; | ||
280 | int i; | ||
281 | for (i = 2; i < args.Length; i++) | ||
282 | { | ||
283 | tmpArgs[i - 2] = args[i]; | ||
284 | } | ||
285 | |||
286 | m_commander.ProcessConsoleCommand(args[1], tmpArgs); | ||
287 | } | ||
288 | } | ||
289 | #endregion | ||
290 | |||
291 | } | ||
292 | } | ||
293 | |||
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs index d052f38..8d27f9c 100644 --- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | |||
@@ -460,7 +460,7 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
460 | 460 | ||
461 | } | 461 | } |
462 | 462 | ||
463 | public void SendGenericMessage(string method, List<string> message) | 463 | public void SendGenericMessage(string method, List<byte[]> message) |
464 | { | 464 | { |
465 | 465 | ||
466 | } | 466 | } |
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionDataStore.cs b/OpenSim/Region/Framework/Interfaces/IRegionDataStore.cs index 78bd622..3e8e196 100644 --- a/OpenSim/Region/Framework/Interfaces/IRegionDataStore.cs +++ b/OpenSim/Region/Framework/Interfaces/IRegionDataStore.cs | |||
@@ -103,6 +103,8 @@ namespace OpenSim.Region.Framework.Interfaces | |||
103 | 103 | ||
104 | void StoreRegionSettings(RegionSettings rs); | 104 | void StoreRegionSettings(RegionSettings rs); |
105 | RegionSettings LoadRegionSettings(UUID regionUUID); | 105 | RegionSettings LoadRegionSettings(UUID regionUUID); |
106 | RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID); | ||
107 | void StoreRegionWindlightSettings(RegionLightShareData wl); | ||
106 | 108 | ||
107 | void Shutdown(); | 109 | void Shutdown(); |
108 | } | 110 | } |
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs index dc9ae19..ef125cd 100644 --- a/OpenSim/Region/Framework/Scenes/EventManager.cs +++ b/OpenSim/Region/Framework/Scenes/EventManager.cs | |||
@@ -206,7 +206,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
206 | public event OnMakeChildAgentDelegate OnMakeChildAgent; | 206 | public event OnMakeChildAgentDelegate OnMakeChildAgent; |
207 | 207 | ||
208 | public delegate void OnMakeRootAgentDelegate(ScenePresence presence); | 208 | public delegate void OnMakeRootAgentDelegate(ScenePresence presence); |
209 | public delegate void OnSaveNewWindlightProfileDelegate(); | ||
210 | public delegate void OnSendNewWindlightProfileTargetedDelegate(RegionLightShareData wl, UUID user); | ||
209 | public event OnMakeRootAgentDelegate OnMakeRootAgent; | 211 | public event OnMakeRootAgentDelegate OnMakeRootAgent; |
212 | public event OnSendNewWindlightProfileTargetedDelegate OnSendNewWindlightProfileTargeted; | ||
213 | public event OnSaveNewWindlightProfileDelegate OnSaveNewWindlightProfile; | ||
210 | 214 | ||
211 | /// <summary> | 215 | /// <summary> |
212 | /// Triggered when an object or attachment enters a scene | 216 | /// Triggered when an object or attachment enters a scene |
@@ -1216,6 +1220,24 @@ namespace OpenSim.Region.Framework.Scenes | |||
1216 | } | 1220 | } |
1217 | } | 1221 | } |
1218 | 1222 | ||
1223 | public void TriggerOnSendNewWindlightProfileTargeted(RegionLightShareData wl, UUID user) | ||
1224 | { | ||
1225 | OnSendNewWindlightProfileTargetedDelegate handlerSendNewWindlightProfileTargeted = OnSendNewWindlightProfileTargeted; | ||
1226 | if (handlerSendNewWindlightProfileTargeted != null) | ||
1227 | { | ||
1228 | handlerSendNewWindlightProfileTargeted(wl, user); | ||
1229 | } | ||
1230 | } | ||
1231 | |||
1232 | public void TriggerOnSaveNewWindlightProfile() | ||
1233 | { | ||
1234 | OnSaveNewWindlightProfileDelegate handlerSaveNewWindlightProfile = OnSaveNewWindlightProfile; | ||
1235 | if (handlerSaveNewWindlightProfile != null) | ||
1236 | { | ||
1237 | handlerSaveNewWindlightProfile(); | ||
1238 | } | ||
1239 | } | ||
1240 | |||
1219 | public void TriggerOnMakeRootAgent(ScenePresence presence) | 1241 | public void TriggerOnMakeRootAgent(ScenePresence presence) |
1220 | { | 1242 | { |
1221 | OnMakeRootAgentDelegate handlerMakeRootAgent = OnMakeRootAgent; | 1243 | OnMakeRootAgentDelegate handlerMakeRootAgent = OnMakeRootAgent; |
@@ -1992,4 +2014,4 @@ namespace OpenSim.Region.Framework.Scenes | |||
1992 | } | 2014 | } |
1993 | } | 2015 | } |
1994 | } | 2016 | } |
1995 | } \ No newline at end of file | 2017 | } |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 0085df3..fc915a3 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1715,6 +1715,19 @@ namespace OpenSim.Region.Framework.Scenes | |||
1715 | m_storageManager.DataStore.StoreTerrain(Heightmap.GetDoubles(), RegionInfo.RegionID); | 1715 | m_storageManager.DataStore.StoreTerrain(Heightmap.GetDoubles(), RegionInfo.RegionID); |
1716 | } | 1716 | } |
1717 | 1717 | ||
1718 | public void StoreWindlightProfile(RegionLightShareData wl) | ||
1719 | { | ||
1720 | m_regInfo.WindlightSettings = wl; | ||
1721 | m_storageManager.DataStore.StoreRegionWindlightSettings(wl); | ||
1722 | m_eventManager.TriggerOnSaveNewWindlightProfile(); | ||
1723 | } | ||
1724 | |||
1725 | public void LoadWindlightProfile() | ||
1726 | { | ||
1727 | m_regInfo.WindlightSettings = m_storageManager.DataStore.LoadRegionWindlightSettings(RegionInfo.RegionID); | ||
1728 | m_eventManager.TriggerOnSaveNewWindlightProfile(); | ||
1729 | } | ||
1730 | |||
1718 | /// <summary> | 1731 | /// <summary> |
1719 | /// Loads the World heightmap | 1732 | /// Loads the World heightmap |
1720 | /// </summary> | 1733 | /// </summary> |
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs index c77220c..8b2d387 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs | |||
@@ -101,7 +101,16 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
101 | { | 101 | { |
102 | throw new NotImplementedException(); | 102 | throw new NotImplementedException(); |
103 | } | 103 | } |
104 | 104 | public RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID) | |
105 | { | ||
106 | //This connector doesn't support the windlight module yet | ||
107 | //Return default LL windlight settings | ||
108 | return new RegionLightShareData(); | ||
109 | } | ||
110 | public void StoreRegionWindlightSettings(RegionLightShareData wl) | ||
111 | { | ||
112 | //This connector doesn't support the windlight module yet | ||
113 | } | ||
105 | public RegionSettings LoadRegionSettings(UUID regionUUID) | 114 | public RegionSettings LoadRegionSettings(UUID regionUUID) |
106 | { | 115 | { |
107 | return null; | 116 | return null; |
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index 1885946..f5b148f 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
@@ -964,7 +964,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
964 | // TODO | 964 | // TODO |
965 | } | 965 | } |
966 | 966 | ||
967 | public void SendGenericMessage(string method, List<string> message) | 967 | public void SendGenericMessage(string method, List<byte[]> message) |
968 | { | 968 | { |
969 | 969 | ||
970 | } | 970 | } |
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index 77958eb..338c04b 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
@@ -550,7 +550,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
550 | 550 | ||
551 | } | 551 | } |
552 | 552 | ||
553 | public void SendGenericMessage(string method, List<string> message) | 553 | public void SendGenericMessage(string method, List<byte[]> message) |
554 | { | 554 | { |
555 | 555 | ||
556 | } | 556 | } |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs new file mode 100644 index 0000000..880ca1b --- /dev/null +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs | |||
@@ -0,0 +1,504 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | using System.Reflection; | ||
30 | using System.Collections; | ||
31 | using System.Collections.Generic; | ||
32 | using System.Runtime.Remoting.Lifetime; | ||
33 | using OpenMetaverse; | ||
34 | using Nini.Config; | ||
35 | using OpenSim; | ||
36 | using OpenSim.Framework; | ||
37 | using OpenSim.Region.CoreModules.World.LightShare; | ||
38 | using OpenSim.Region.Framework.Interfaces; | ||
39 | using OpenSim.Region.Framework.Scenes; | ||
40 | using OpenSim.Region.ScriptEngine.Shared; | ||
41 | using OpenSim.Region.ScriptEngine.Shared.Api.Plugins; | ||
42 | using OpenSim.Region.ScriptEngine.Shared.ScriptBase; | ||
43 | using OpenSim.Region.ScriptEngine.Interfaces; | ||
44 | using OpenSim.Region.ScriptEngine.Shared.Api.Interfaces; | ||
45 | |||
46 | using LSL_Float = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat; | ||
47 | using LSL_Integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger; | ||
48 | using LSL_Key = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString; | ||
49 | using LSL_List = OpenSim.Region.ScriptEngine.Shared.LSL_Types.list; | ||
50 | using LSL_Rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion; | ||
51 | using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString; | ||
52 | using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3; | ||
53 | |||
54 | namespace OpenSim.Region.ScriptEngine.Shared.Api | ||
55 | { | ||
56 | [Serializable] | ||
57 | public class CM_Api : MarshalByRefObject, ICM_Api, IScriptApi | ||
58 | { | ||
59 | internal IScriptEngine m_ScriptEngine; | ||
60 | internal SceneObjectPart m_host; | ||
61 | internal uint m_localID; | ||
62 | internal UUID m_itemID; | ||
63 | internal bool m_CMFunctionsEnabled = false; | ||
64 | internal IScriptModuleComms m_comms = null; | ||
65 | |||
66 | public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, uint localID, UUID itemID) | ||
67 | { | ||
68 | m_ScriptEngine = ScriptEngine; | ||
69 | m_host = host; | ||
70 | m_localID = localID; | ||
71 | m_itemID = itemID; | ||
72 | |||
73 | if (m_ScriptEngine.Config.GetBoolean("AllowCareminsterFunctions", false)) | ||
74 | m_CMFunctionsEnabled = true; | ||
75 | |||
76 | m_comms = m_ScriptEngine.World.RequestModuleInterface<IScriptModuleComms>(); | ||
77 | if (m_comms == null) | ||
78 | m_CMFunctionsEnabled = false; | ||
79 | } | ||
80 | |||
81 | public override Object InitializeLifetimeService() | ||
82 | { | ||
83 | ILease lease = (ILease)base.InitializeLifetimeService(); | ||
84 | |||
85 | if (lease.CurrentState == LeaseState.Initial) | ||
86 | { | ||
87 | lease.InitialLeaseTime = TimeSpan.FromMinutes(0); | ||
88 | // lease.RenewOnCallTime = TimeSpan.FromSeconds(10.0); | ||
89 | // lease.SponsorshipTimeout = TimeSpan.FromMinutes(1.0); | ||
90 | } | ||
91 | return lease; | ||
92 | } | ||
93 | |||
94 | public Scene World | ||
95 | { | ||
96 | get { return m_ScriptEngine.World; } | ||
97 | } | ||
98 | |||
99 | // | ||
100 | //Dumps an error message on the debug console. | ||
101 | // | ||
102 | |||
103 | internal void CMShoutError(string message) | ||
104 | { | ||
105 | if (message.Length > 1023) | ||
106 | message = message.Substring(0, 1023); | ||
107 | |||
108 | World.SimChat(Utils.StringToBytes(message), | ||
109 | ChatTypeEnum.Shout, ScriptBaseClass.DEBUG_CHANNEL, m_host.ParentGroup.RootPart.AbsolutePosition, m_host.Name, m_host.UUID, true); | ||
110 | |||
111 | IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>(); | ||
112 | wComm.DeliverMessage(ChatTypeEnum.Shout, ScriptBaseClass.DEBUG_CHANNEL, m_host.Name, m_host.UUID, message); | ||
113 | } | ||
114 | |||
115 | /// <summary> | ||
116 | /// Get the current Windlight scene | ||
117 | /// </summary> | ||
118 | /// <returns>List of windlight parameters</returns> | ||
119 | public LSL_List cmGetWindlightScene(LSL_List rules) | ||
120 | { | ||
121 | if (!m_CMFunctionsEnabled) | ||
122 | { | ||
123 | CMShoutError("Careminster functions are not enabled."); | ||
124 | return new LSL_List(); | ||
125 | } | ||
126 | m_host.AddScriptLPS(1); | ||
127 | RegionLightShareData wl = m_host.ParentGroup.Scene.RegionInfo.WindlightSettings; | ||
128 | |||
129 | LSL_List values = new LSL_List(); | ||
130 | int idx = 0; | ||
131 | while (idx < rules.Length) | ||
132 | { | ||
133 | uint rule = (uint)rules.GetLSLIntegerItem(idx); | ||
134 | LSL_List toadd = new LSL_List(); | ||
135 | |||
136 | switch (rule) | ||
137 | { | ||
138 | case (int)ScriptBaseClass.WL_AMBIENT: | ||
139 | toadd.Add(new LSL_Rotation(wl.ambient.X, wl.ambient.Y, wl.ambient.Z, wl.ambient.W)); | ||
140 | break; | ||
141 | case (int)ScriptBaseClass.WL_BIG_WAVE_DIRECTION: | ||
142 | toadd.Add(new LSL_Vector(wl.bigWaveDirection.X, wl.bigWaveDirection.Y, 0.0f)); | ||
143 | break; | ||
144 | case (int)ScriptBaseClass.WL_BLUE_DENSITY: | ||
145 | toadd.Add(new LSL_Rotation(wl.blueDensity.X, wl.blueDensity.Y, wl.blueDensity.Z, wl.blueDensity.W)); | ||
146 | break; | ||
147 | case (int)ScriptBaseClass.WL_BLUR_MULTIPLIER: | ||
148 | toadd.Add(new LSL_Float(wl.blurMultiplier)); | ||
149 | break; | ||
150 | case (int)ScriptBaseClass.WL_CLOUD_COLOR: | ||
151 | toadd.Add(new LSL_Rotation(wl.cloudColor.X, wl.cloudColor.Y, wl.cloudColor.Z, wl.cloudColor.W)); | ||
152 | break; | ||
153 | case (int)ScriptBaseClass.WL_CLOUD_COVERAGE: | ||
154 | toadd.Add(new LSL_Float(wl.cloudCoverage)); | ||
155 | break; | ||
156 | case (int)ScriptBaseClass.WL_CLOUD_DETAIL_XY_DENSITY: | ||
157 | toadd.Add(new LSL_Vector(wl.cloudDetailXYDensity.X, wl.cloudDetailXYDensity.Y, wl.cloudDetailXYDensity.Z)); | ||
158 | break; | ||
159 | case (int)ScriptBaseClass.WL_CLOUD_SCALE: | ||
160 | toadd.Add(new LSL_Float(wl.cloudScale)); | ||
161 | break; | ||
162 | case (int)ScriptBaseClass.WL_CLOUD_SCROLL_X: | ||
163 | toadd.Add(new LSL_Float(wl.cloudScrollX)); | ||
164 | break; | ||
165 | case (int)ScriptBaseClass.WL_CLOUD_SCROLL_X_LOCK: | ||
166 | toadd.Add(new LSL_Integer(wl.cloudScrollXLock ? 1 : 0)); | ||
167 | break; | ||
168 | case (int)ScriptBaseClass.WL_CLOUD_SCROLL_Y: | ||
169 | toadd.Add(new LSL_Float(wl.cloudScrollY)); | ||
170 | break; | ||
171 | case (int)ScriptBaseClass.WL_CLOUD_SCROLL_Y_LOCK: | ||
172 | toadd.Add(new LSL_Integer(wl.cloudScrollYLock ? 1 : 0)); | ||
173 | break; | ||
174 | case (int)ScriptBaseClass.WL_CLOUD_XY_DENSITY: | ||
175 | toadd.Add(new LSL_Vector(wl.cloudXYDensity.X, wl.cloudXYDensity.Y, wl.cloudXYDensity.Z)); | ||
176 | break; | ||
177 | case (int)ScriptBaseClass.WL_DENSITY_MULTIPLIER: | ||
178 | toadd.Add(new LSL_Float(wl.densityMultiplier)); | ||
179 | break; | ||
180 | case (int)ScriptBaseClass.WL_DISTANCE_MULTIPLIER: | ||
181 | toadd.Add(new LSL_Float(wl.distanceMultiplier)); | ||
182 | break; | ||
183 | case (int)ScriptBaseClass.WL_DRAW_CLASSIC_CLOUDS: | ||
184 | toadd.Add(new LSL_Integer(wl.drawClassicClouds ? 1 : 0)); | ||
185 | break; | ||
186 | case (int)ScriptBaseClass.WL_EAST_ANGLE: | ||
187 | toadd.Add(new LSL_Float(wl.eastAngle)); | ||
188 | break; | ||
189 | case (int)ScriptBaseClass.WL_FRESNEL_OFFSET: | ||
190 | toadd.Add(new LSL_Float(wl.fresnelOffset)); | ||
191 | break; | ||
192 | case (int)ScriptBaseClass.WL_FRESNEL_SCALE: | ||
193 | toadd.Add(new LSL_Float(wl.fresnelScale)); | ||
194 | break; | ||
195 | case (int)ScriptBaseClass.WL_HAZE_DENSITY: | ||
196 | toadd.Add(new LSL_Float(wl.hazeDensity)); | ||
197 | break; | ||
198 | case (int)ScriptBaseClass.WL_HAZE_HORIZON: | ||
199 | toadd.Add(new LSL_Float(wl.hazeHorizon)); | ||
200 | break; | ||
201 | case (int)ScriptBaseClass.WL_HORIZON: | ||
202 | toadd.Add(new LSL_Rotation(wl.horizon.X, wl.horizon.Y, wl.horizon.Z, wl.horizon.W)); | ||
203 | break; | ||
204 | case (int)ScriptBaseClass.WL_LITTLE_WAVE_DIRECTION: | ||
205 | toadd.Add(new LSL_Vector(wl.littleWaveDirection.X, wl.littleWaveDirection.Y, 0.0f)); | ||
206 | break; | ||
207 | case (int)ScriptBaseClass.WL_MAX_ALTITUDE: | ||
208 | toadd.Add(new LSL_Integer(wl.maxAltitude)); | ||
209 | break; | ||
210 | case (int)ScriptBaseClass.WL_NORMAL_MAP_TEXTURE: | ||
211 | toadd.Add(new LSL_Key(wl.normalMapTexture.ToString())); | ||
212 | break; | ||
213 | case (int)ScriptBaseClass.WL_REFLECTION_WAVELET_SCALE: | ||
214 | toadd.Add(new LSL_Vector(wl.reflectionWaveletScale.X, wl.reflectionWaveletScale.Y, wl.reflectionWaveletScale.Z)); | ||
215 | break; | ||
216 | case (int)ScriptBaseClass.WL_REFRACT_SCALE_ABOVE: | ||
217 | toadd.Add(new LSL_Float(wl.refractScaleAbove)); | ||
218 | break; | ||
219 | case (int)ScriptBaseClass.WL_REFRACT_SCALE_BELOW: | ||
220 | toadd.Add(new LSL_Float(wl.refractScaleBelow)); | ||
221 | break; | ||
222 | case (int)ScriptBaseClass.WL_SCENE_GAMMA: | ||
223 | toadd.Add(new LSL_Float(wl.sceneGamma)); | ||
224 | break; | ||
225 | case (int)ScriptBaseClass.WL_STAR_BRIGHTNESS: | ||
226 | toadd.Add(new LSL_Float(wl.starBrightness)); | ||
227 | break; | ||
228 | case (int)ScriptBaseClass.WL_SUN_GLOW_FOCUS: | ||
229 | toadd.Add(new LSL_Float(wl.sunGlowFocus)); | ||
230 | break; | ||
231 | case (int)ScriptBaseClass.WL_SUN_GLOW_SIZE: | ||
232 | toadd.Add(new LSL_Float(wl.sunGlowSize)); | ||
233 | break; | ||
234 | case (int)ScriptBaseClass.WL_SUN_MOON_COLOR: | ||
235 | toadd.Add(new LSL_Rotation(wl.sunMoonColor.X, wl.sunMoonColor.Y, wl.sunMoonColor.Z, wl.sunMoonColor.W)); | ||
236 | break; | ||
237 | case (int)ScriptBaseClass.WL_UNDERWATER_FOG_MODIFIER: | ||
238 | toadd.Add(new LSL_Float(wl.underwaterFogModifier)); | ||
239 | break; | ||
240 | case (int)ScriptBaseClass.WL_WATER_COLOR: | ||
241 | toadd.Add(new LSL_Vector(wl.waterColor.X, wl.waterColor.Y, wl.waterColor.Z)); | ||
242 | break; | ||
243 | case (int)ScriptBaseClass.WL_WATER_FOG_DENSITY_EXPONENT: | ||
244 | toadd.Add(new LSL_Float(wl.waterFogDensityExponent)); | ||
245 | break; | ||
246 | } | ||
247 | |||
248 | if (toadd.Length > 0) | ||
249 | { | ||
250 | values.Add(rule); | ||
251 | values.Add(toadd.Data[0]); | ||
252 | } | ||
253 | idx++; | ||
254 | } | ||
255 | |||
256 | |||
257 | return values; | ||
258 | |||
259 | } | ||
260 | |||
261 | private RegionLightShareData getWindlightProfileFromRules(LSL_List rules) | ||
262 | { | ||
263 | RegionLightShareData wl = (RegionLightShareData)m_host.ParentGroup.Scene.RegionInfo.WindlightSettings.Clone(); | ||
264 | |||
265 | LSL_List values = new LSL_List(); | ||
266 | int idx = 0; | ||
267 | while (idx < rules.Length) | ||
268 | { | ||
269 | uint rule = (uint)rules.GetLSLIntegerItem(idx); | ||
270 | LSL_Types.Quaternion iQ; | ||
271 | LSL_Types.Vector3 iV; | ||
272 | switch (rule) | ||
273 | { | ||
274 | case (int)ScriptBaseClass.WL_SUN_MOON_POSITION: | ||
275 | idx++; | ||
276 | wl.sunMoonPosition = (float)rules.GetLSLFloatItem(idx); | ||
277 | break; | ||
278 | case (int)ScriptBaseClass.WL_AMBIENT: | ||
279 | idx++; | ||
280 | iQ = rules.GetQuaternionItem(idx); | ||
281 | wl.ambient = new Vector4((float)iQ.x, (float)iQ.y, (float)iQ.z, (float)iQ.s); | ||
282 | break; | ||
283 | case (int)ScriptBaseClass.WL_BIG_WAVE_DIRECTION: | ||
284 | idx++; | ||
285 | iV = rules.GetVector3Item(idx); | ||
286 | wl.bigWaveDirection = new Vector2((float)iV.x, (float)iV.y); | ||
287 | break; | ||
288 | case (int)ScriptBaseClass.WL_BLUE_DENSITY: | ||
289 | idx++; | ||
290 | iQ = rules.GetQuaternionItem(idx); | ||
291 | wl.blueDensity = new Vector4((float)iQ.x, (float)iQ.y, (float)iQ.z, (float)iQ.s); | ||
292 | break; | ||
293 | case (int)ScriptBaseClass.WL_BLUR_MULTIPLIER: | ||
294 | idx++; | ||
295 | wl.blurMultiplier = (float)rules.GetLSLFloatItem(idx); | ||
296 | break; | ||
297 | case (int)ScriptBaseClass.WL_CLOUD_COLOR: | ||
298 | idx++; | ||
299 | iQ = rules.GetQuaternionItem(idx); | ||
300 | wl.cloudColor = new Vector4((float)iQ.x, (float)iQ.y, (float)iQ.z, (float)iQ.s); | ||
301 | break; | ||
302 | case (int)ScriptBaseClass.WL_CLOUD_COVERAGE: | ||
303 | idx++; | ||
304 | wl.cloudCoverage = (float)rules.GetLSLFloatItem(idx); | ||
305 | break; | ||
306 | case (int)ScriptBaseClass.WL_CLOUD_DETAIL_XY_DENSITY: | ||
307 | idx++; | ||
308 | iV = rules.GetVector3Item(idx); | ||
309 | wl.cloudDetailXYDensity = new Vector3((float)iV.x, (float)iV.y, (float)iV.z); | ||
310 | break; | ||
311 | case (int)ScriptBaseClass.WL_CLOUD_SCALE: | ||
312 | idx++; | ||
313 | wl.cloudScale = (float)rules.GetLSLFloatItem(idx); | ||
314 | break; | ||
315 | case (int)ScriptBaseClass.WL_CLOUD_SCROLL_X: | ||
316 | idx++; | ||
317 | wl.cloudScrollX = (float)rules.GetLSLFloatItem(idx); | ||
318 | break; | ||
319 | case (int)ScriptBaseClass.WL_CLOUD_SCROLL_X_LOCK: | ||
320 | idx++; | ||
321 | wl.cloudScrollXLock = rules.GetLSLIntegerItem(idx).value == 1 ? true : false; | ||
322 | break; | ||
323 | case (int)ScriptBaseClass.WL_CLOUD_SCROLL_Y: | ||
324 | idx++; | ||
325 | wl.cloudScrollY = (float)rules.GetLSLFloatItem(idx); | ||
326 | break; | ||
327 | case (int)ScriptBaseClass.WL_CLOUD_SCROLL_Y_LOCK: | ||
328 | idx++; | ||
329 | wl.cloudScrollYLock = rules.GetLSLIntegerItem(idx).value == 1 ? true : false; | ||
330 | break; | ||
331 | case (int)ScriptBaseClass.WL_CLOUD_XY_DENSITY: | ||
332 | idx++; | ||
333 | iV = rules.GetVector3Item(idx); | ||
334 | wl.cloudXYDensity = new Vector3((float)iV.x, (float)iV.y, (float)iV.z); | ||
335 | break; | ||
336 | case (int)ScriptBaseClass.WL_DENSITY_MULTIPLIER: | ||
337 | idx++; | ||
338 | wl.densityMultiplier = (float)rules.GetLSLFloatItem(idx); | ||
339 | break; | ||
340 | case (int)ScriptBaseClass.WL_DISTANCE_MULTIPLIER: | ||
341 | idx++; | ||
342 | wl.distanceMultiplier = (float)rules.GetLSLFloatItem(idx); | ||
343 | break; | ||
344 | case (int)ScriptBaseClass.WL_DRAW_CLASSIC_CLOUDS: | ||
345 | idx++; | ||
346 | wl.drawClassicClouds = rules.GetLSLIntegerItem(idx).value == 1 ? true : false; | ||
347 | break; | ||
348 | case (int)ScriptBaseClass.WL_EAST_ANGLE: | ||
349 | idx++; | ||
350 | wl.eastAngle = (float)rules.GetLSLFloatItem(idx); | ||
351 | break; | ||
352 | case (int)ScriptBaseClass.WL_FRESNEL_OFFSET: | ||
353 | idx++; | ||
354 | wl.fresnelOffset = (float)rules.GetLSLFloatItem(idx); | ||
355 | break; | ||
356 | case (int)ScriptBaseClass.WL_FRESNEL_SCALE: | ||
357 | idx++; | ||
358 | wl.fresnelScale = (float)rules.GetLSLFloatItem(idx); | ||
359 | break; | ||
360 | case (int)ScriptBaseClass.WL_HAZE_DENSITY: | ||
361 | idx++; | ||
362 | wl.hazeDensity = (float)rules.GetLSLFloatItem(idx); | ||
363 | break; | ||
364 | case (int)ScriptBaseClass.WL_HAZE_HORIZON: | ||
365 | idx++; | ||
366 | wl.hazeHorizon = (float)rules.GetLSLFloatItem(idx); | ||
367 | break; | ||
368 | case (int)ScriptBaseClass.WL_HORIZON: | ||
369 | idx++; | ||
370 | iQ = rules.GetQuaternionItem(idx); | ||
371 | wl.horizon = new Vector4((float)iQ.x, (float)iQ.y, (float)iQ.z, (float)iQ.s); | ||
372 | break; | ||
373 | case (int)ScriptBaseClass.WL_LITTLE_WAVE_DIRECTION: | ||
374 | idx++; | ||
375 | iV = rules.GetVector3Item(idx); | ||
376 | wl.littleWaveDirection = new Vector2((float)iV.x, (float)iV.y); | ||
377 | break; | ||
378 | case (int)ScriptBaseClass.WL_MAX_ALTITUDE: | ||
379 | idx++; | ||
380 | wl.maxAltitude = (ushort)rules.GetLSLIntegerItem(idx).value; | ||
381 | break; | ||
382 | case (int)ScriptBaseClass.WL_NORMAL_MAP_TEXTURE: | ||
383 | idx++; | ||
384 | wl.normalMapTexture = new UUID(rules.GetLSLStringItem(idx).m_string); | ||
385 | break; | ||
386 | case (int)ScriptBaseClass.WL_REFLECTION_WAVELET_SCALE: | ||
387 | idx++; | ||
388 | iV = rules.GetVector3Item(idx); | ||
389 | wl.reflectionWaveletScale = new Vector3((float)iV.x, (float)iV.y, (float)iV.z); | ||
390 | break; | ||
391 | case (int)ScriptBaseClass.WL_REFRACT_SCALE_ABOVE: | ||
392 | idx++; | ||
393 | wl.refractScaleAbove = (float)rules.GetLSLFloatItem(idx); | ||
394 | break; | ||
395 | case (int)ScriptBaseClass.WL_REFRACT_SCALE_BELOW: | ||
396 | idx++; | ||
397 | wl.refractScaleBelow = (float)rules.GetLSLFloatItem(idx); | ||
398 | break; | ||
399 | case (int)ScriptBaseClass.WL_SCENE_GAMMA: | ||
400 | idx++; | ||
401 | wl.sceneGamma = (float)rules.GetLSLFloatItem(idx); | ||
402 | break; | ||
403 | case (int)ScriptBaseClass.WL_STAR_BRIGHTNESS: | ||
404 | idx++; | ||
405 | wl.starBrightness = (float)rules.GetLSLFloatItem(idx); | ||
406 | break; | ||
407 | case (int)ScriptBaseClass.WL_SUN_GLOW_FOCUS: | ||
408 | idx++; | ||
409 | wl.sunGlowFocus = (float)rules.GetLSLFloatItem(idx); | ||
410 | break; | ||
411 | case (int)ScriptBaseClass.WL_SUN_GLOW_SIZE: | ||
412 | idx++; | ||
413 | wl.sunGlowSize = (float)rules.GetLSLFloatItem(idx); | ||
414 | break; | ||
415 | case (int)ScriptBaseClass.WL_SUN_MOON_COLOR: | ||
416 | idx++; | ||
417 | iQ = rules.GetQuaternionItem(idx); | ||
418 | wl.sunMoonColor = new Vector4((float)iQ.x, (float)iQ.y, (float)iQ.z, (float)iQ.s); | ||
419 | break; | ||
420 | case (int)ScriptBaseClass.WL_UNDERWATER_FOG_MODIFIER: | ||
421 | idx++; | ||
422 | wl.underwaterFogModifier = (float)rules.GetLSLFloatItem(idx); | ||
423 | break; | ||
424 | case (int)ScriptBaseClass.WL_WATER_COLOR: | ||
425 | idx++; | ||
426 | iV = rules.GetVector3Item(idx); | ||
427 | wl.waterColor = new Vector3((float)iV.x, (float)iV.y, (float)iV.z); | ||
428 | break; | ||
429 | case (int)ScriptBaseClass.WL_WATER_FOG_DENSITY_EXPONENT: | ||
430 | idx++; | ||
431 | wl.waterFogDensityExponent = (float)rules.GetLSLFloatItem(idx); | ||
432 | break; | ||
433 | } | ||
434 | idx++; | ||
435 | } | ||
436 | return wl; | ||
437 | } | ||
438 | /// <summary> | ||
439 | /// Set the current Windlight scene | ||
440 | /// </summary> | ||
441 | /// <param name="rules"></param> | ||
442 | /// <returns>success: true or false</returns> | ||
443 | public int cmSetWindlightScene(LSL_List rules) | ||
444 | { | ||
445 | if (!m_CMFunctionsEnabled) | ||
446 | { | ||
447 | CMShoutError("Careminster functions are not enabled."); | ||
448 | return 0; | ||
449 | } | ||
450 | if (!World.RegionInfo.EstateSettings.IsEstateManager(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200) | ||
451 | { | ||
452 | CMShoutError("cmSetWindlightScene can only be used by estate managers or owners."); | ||
453 | return 0; | ||
454 | } | ||
455 | int success = 0; | ||
456 | m_host.AddScriptLPS(1); | ||
457 | if (LightShareModule.EnableWindlight) | ||
458 | { | ||
459 | RegionLightShareData wl = getWindlightProfileFromRules(rules); | ||
460 | m_host.ParentGroup.Scene.StoreWindlightProfile(wl); | ||
461 | success = 1; | ||
462 | } | ||
463 | else | ||
464 | { | ||
465 | CMShoutError("Windlight module is disabled"); | ||
466 | return 0; | ||
467 | } | ||
468 | return success; | ||
469 | } | ||
470 | /// <summary> | ||
471 | /// Set the current Windlight scene to a target avatar | ||
472 | /// </summary> | ||
473 | /// <param name="rules"></param> | ||
474 | /// <returns>success: true or false</returns> | ||
475 | public int cmSetWindlightSceneTargeted(LSL_List rules, LSL_Key target) | ||
476 | { | ||
477 | if (!m_CMFunctionsEnabled) | ||
478 | { | ||
479 | CMShoutError("Careminster functions are not enabled."); | ||
480 | return 0; | ||
481 | } | ||
482 | if (!World.RegionInfo.EstateSettings.IsEstateManager(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200) | ||
483 | { | ||
484 | CMShoutError("cmSetWindlightSceneTargeted can only be used by estate managers or owners."); | ||
485 | return 0; | ||
486 | } | ||
487 | int success = 0; | ||
488 | m_host.AddScriptLPS(1); | ||
489 | if (LightShareModule.EnableWindlight) | ||
490 | { | ||
491 | RegionLightShareData wl = getWindlightProfileFromRules(rules); | ||
492 | World.EventManager.TriggerOnSendNewWindlightProfileTargeted(wl, new UUID(target.m_string)); | ||
493 | success = 1; | ||
494 | } | ||
495 | else | ||
496 | { | ||
497 | CMShoutError("Windlight module is disabled"); | ||
498 | return 0; | ||
499 | } | ||
500 | return success; | ||
501 | } | ||
502 | |||
503 | } | ||
504 | } | ||
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ICM_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ICM_Api.cs new file mode 100644 index 0000000..f13b6e5 --- /dev/null +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ICM_Api.cs | |||
@@ -0,0 +1,48 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System.Collections; | ||
29 | using OpenSim.Region.ScriptEngine.Interfaces; | ||
30 | |||
31 | using key = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString; | ||
32 | using rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion; | ||
33 | using vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3; | ||
34 | using LSL_List = OpenSim.Region.ScriptEngine.Shared.LSL_Types.list; | ||
35 | using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString; | ||
36 | using LSL_Integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger; | ||
37 | using LSL_Float = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat; | ||
38 | |||
39 | namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | ||
40 | { | ||
41 | public interface ICM_Api | ||
42 | { | ||
43 | // Windlight Functions | ||
44 | LSL_List cmGetWindlightScene(LSL_List rules); | ||
45 | int cmSetWindlightScene(LSL_List rules); | ||
46 | int cmSetWindlightSceneTargeted(LSL_List rules, key target); | ||
47 | } | ||
48 | } | ||
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Constants.cs new file mode 100644 index 0000000..f94ef4a --- /dev/null +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Constants.cs | |||
@@ -0,0 +1,77 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | using vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3; | ||
30 | using rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion; | ||
31 | using LSLInteger = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger; | ||
32 | |||
33 | namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | ||
34 | { | ||
35 | public partial class ScriptBaseClass | ||
36 | { | ||
37 | // Constants for cmWindlight* | ||
38 | public const int WL_WATER_COLOR = 0; | ||
39 | public const int WL_WATER_FOG_DENSITY_EXPONENT = 1; | ||
40 | public const int WL_UNDERWATER_FOG_MODIFIER = 2; | ||
41 | public const int WL_REFLECTION_WAVELET_SCALE = 3; | ||
42 | public const int WL_FRESNEL_SCALE = 4; | ||
43 | public const int WL_FRESNEL_OFFSET = 5; | ||
44 | public const int WL_REFRACT_SCALE_ABOVE = 6; | ||
45 | public const int WL_REFRACT_SCALE_BELOW = 7; | ||
46 | public const int WL_BLUR_MULTIPLIER = 8; | ||
47 | public const int WL_BIG_WAVE_DIRECTION = 9; | ||
48 | public const int WL_LITTLE_WAVE_DIRECTION = 10; | ||
49 | public const int WL_NORMAL_MAP_TEXTURE = 11; | ||
50 | public const int WL_HORIZON = 12; | ||
51 | public const int WL_HAZE_HORIZON = 13; | ||
52 | public const int WL_BLUE_DENSITY = 14; | ||
53 | public const int WL_HAZE_DENSITY = 15; | ||
54 | public const int WL_DENSITY_MULTIPLIER = 16; | ||
55 | public const int WL_DISTANCE_MULTIPLIER = 17; | ||
56 | public const int WL_MAX_ALTITUDE = 18; | ||
57 | public const int WL_SUN_MOON_COLOR = 19; | ||
58 | public const int WL_AMBIENT = 20; | ||
59 | public const int WL_EAST_ANGLE = 21; | ||
60 | public const int WL_SUN_GLOW_FOCUS = 22; | ||
61 | public const int WL_SUN_GLOW_SIZE = 23; | ||
62 | public const int WL_SCENE_GAMMA = 24; | ||
63 | public const int WL_STAR_BRIGHTNESS = 25; | ||
64 | public const int WL_CLOUD_COLOR = 26; | ||
65 | public const int WL_CLOUD_XY_DENSITY = 27; | ||
66 | public const int WL_CLOUD_COVERAGE = 28; | ||
67 | public const int WL_CLOUD_SCALE = 29; | ||
68 | public const int WL_CLOUD_DETAIL_XY_DENSITY = 30; | ||
69 | public const int WL_CLOUD_SCROLL_X = 31; | ||
70 | public const int WL_CLOUD_SCROLL_Y = 32; | ||
71 | public const int WL_CLOUD_SCROLL_Y_LOCK = 33; | ||
72 | public const int WL_CLOUD_SCROLL_X_LOCK = 34; | ||
73 | public const int WL_DRAW_CLASSIC_CLOUDS = 35; | ||
74 | public const int WL_SUN_MOON_POSITION = 36; | ||
75 | |||
76 | } | ||
77 | } | ||
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs new file mode 100644 index 0000000..c0edaae --- /dev/null +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs | |||
@@ -0,0 +1,76 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | using System.Runtime.Remoting.Lifetime; | ||
30 | using System.Threading; | ||
31 | using System.Reflection; | ||
32 | using System.Collections; | ||
33 | using System.Collections.Generic; | ||
34 | using OpenSim.Framework; | ||
35 | using OpenSim.Region.Framework.Interfaces; | ||
36 | using OpenSim.Region.ScriptEngine.Interfaces; | ||
37 | using OpenSim.Region.ScriptEngine.Shared.Api.Interfaces; | ||
38 | using integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger; | ||
39 | using vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3; | ||
40 | using rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion; | ||
41 | using key = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString; | ||
42 | using LSL_List = OpenSim.Region.ScriptEngine.Shared.LSL_Types.list; | ||
43 | using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString; | ||
44 | using LSL_Float = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat; | ||
45 | using LSL_Integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger; | ||
46 | |||
47 | namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | ||
48 | { | ||
49 | public partial class ScriptBaseClass : MarshalByRefObject | ||
50 | { | ||
51 | public ICM_Api m_CM_Functions; | ||
52 | |||
53 | public void ApiTypeCM(IScriptApi api) | ||
54 | { | ||
55 | if (!(api is ICM_Api)) | ||
56 | return; | ||
57 | |||
58 | m_CM_Functions = (ICM_Api)api; | ||
59 | } | ||
60 | |||
61 | public LSL_List cmGetWindlightScene(LSL_List rules) | ||
62 | { | ||
63 | return m_CM_Functions.cmGetWindlightScene(rules); | ||
64 | } | ||
65 | |||
66 | public int cmSetWindlightScene(LSL_List rules) | ||
67 | { | ||
68 | return m_CM_Functions.cmSetWindlightScene(rules); | ||
69 | } | ||
70 | |||
71 | public int cmSetWindlightSceneTargeted(LSL_List rules, key target) | ||
72 | { | ||
73 | return m_CM_Functions.cmSetWindlightSceneTargeted(rules, target); | ||
74 | } | ||
75 | } | ||
76 | } | ||
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.mdp b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.mdp index 98bbc68..23138ef 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.mdp +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.mdp | |||
@@ -17,6 +17,8 @@ | |||
17 | <excludeFiles /> | 17 | <excludeFiles /> |
18 | </DeploymentInformation> | 18 | </DeploymentInformation> |
19 | <Contents> | 19 | <Contents> |
20 | <File name="./CM_Constants.cs" subtype="Code" buildaction="Compile" dependson="" data="" /> | ||
21 | <File name="./CM_Stub.cs" subtype="Code" buildaction="Compile" dependson="" data="" /> | ||
20 | <File name="./Executor.cs" subtype="Code" buildaction="Compile" dependson="" data="" /> | 22 | <File name="./Executor.cs" subtype="Code" buildaction="Compile" dependson="" data="" /> |
21 | <File name="./LSL_Constants.cs" subtype="Code" buildaction="Compile" dependson="" data="" /> | 23 | <File name="./LSL_Constants.cs" subtype="Code" buildaction="Compile" dependson="" data="" /> |
22 | <File name="./LSL_Stub.cs" subtype="Code" buildaction="Compile" dependson="" data="" /> | 24 | <File name="./LSL_Stub.cs" subtype="Code" buildaction="Compile" dependson="" data="" /> |
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index 5fff279..f015db2 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
@@ -518,7 +518,7 @@ namespace OpenSim.Tests.Common.Mock | |||
518 | 518 | ||
519 | } | 519 | } |
520 | 520 | ||
521 | public void SendGenericMessage(string method, List<string> message) | 521 | public void SendGenericMessage(string method, List<byte[]> message) |
522 | { | 522 | { |
523 | 523 | ||
524 | } | 524 | } |