aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJeff Ames2008-04-27 18:35:00 +0000
committerJeff Ames2008-04-27 18:35:00 +0000
commit56497c9615b48f271f5315376e76348bdc41745c (patch)
tree9da5d83ccaee7172b5b33932ba7bba5853bf1372
parent* More attachment stuff, reworked some of the inventory routines to be what I... (diff)
downloadopensim-SC-56497c9615b48f271f5315376e76348bdc41745c.zip
opensim-SC-56497c9615b48f271f5315376e76348bdc41745c.tar.gz
opensim-SC-56497c9615b48f271f5315376e76348bdc41745c.tar.bz2
opensim-SC-56497c9615b48f271f5315376e76348bdc41745c.tar.xz
Minor svn, formatting cleanup.
Diffstat
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs4
-rw-r--r--prebuild.xml105
2 files changed, 50 insertions, 59 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 6a56204..0849698 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -884,12 +884,10 @@ namespace OpenSim.Region.Environment.Scenes
884 if (m_physicsActor == null) 884 if (m_physicsActor == null)
885 { 885 {
886 AddToPhysicalScene(); 886 AddToPhysicalScene();
887
888 } 887 }
889 888
890 m_pos += m_parentPosition + new LLVector3(0.0f, 0.0f, 2.0f*m_sitAvatarHeight); 889 m_pos += m_parentPosition + new LLVector3(0.0f, 0.0f, 2.0f*m_sitAvatarHeight);
891 m_parentPosition = new LLVector3(); 890 m_parentPosition = new LLVector3();
892
893 891
894 m_parentID = 0; 892 m_parentID = 0;
895 SendFullUpdateToAllClients(); 893 SendFullUpdateToAllClients();
@@ -897,7 +895,6 @@ namespace OpenSim.Region.Environment.Scenes
897 if (m_physicsActor != null) 895 if (m_physicsActor != null)
898 { 896 {
899 SetHeight(m_avHeight); 897 SetHeight(m_avHeight);
900
901 } 898 }
902 } 899 }
903 900
@@ -985,7 +982,6 @@ namespace OpenSim.Region.Environment.Scenes
985 StandUp(); 982 StandUp();
986 } 983 }
987 984
988
989 SceneObjectPart part = m_scene.GetSceneObjectPart(targetID); 985 SceneObjectPart part = m_scene.GetSceneObjectPart(targetID);
990 986
991 if (part != null) 987 if (part != null)
diff --git a/prebuild.xml b/prebuild.xml
index 5fc0a42..bcef1cd 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -34,25 +34,25 @@
34 34
35 <!-- Core OpenSim Projects --> 35 <!-- Core OpenSim Projects -->
36<!-- 36<!--
37 <Project name="OpenSim.Model" path="OpenSim/Model" type="Library"> 37 <Project name="OpenSim.Model" path="OpenSim/Model" type="Library">
38 <Configuration name="Debug"> 38 <Configuration name="Debug">
39 <Options> 39 <Options>
40 <OutputPath>../../../bin/</OutputPath> 40 <OutputPath>../../../bin/</OutputPath>
41 </Options> 41 </Options>
42 </Configuration> 42 </Configuration>
43 <Configuration name="Release"> 43 <Configuration name="Release">
44 <Options> 44 <Options>
45 <OutputPath>../../../bin/</OutputPath> 45 <OutputPath>../../../bin/</OutputPath>
46 </Options> 46 </Options>
47 </Configuration> 47 </Configuration>
48 48
49 <ReferencePath>../../../bin/</ReferencePath> 49 <ReferencePath>../../../bin/</ReferencePath>
50 <Reference name="System" localCopy="false"/> 50 <Reference name="System" localCopy="false"/>
51 <Reference name="System.Xml" localCopy="false"/> 51 <Reference name="System.Xml" localCopy="false"/>
52 <Files> 52 <Files>
53 <Match pattern="*.cs" recurse="true"/> 53 <Match pattern="*.cs" recurse="true"/>
54 </Files> 54 </Files>
55 </Project> 55 </Project>
56--> 56-->
57 <Project name="OpenSim.Framework.Console" path="OpenSim/Framework/Console" type="Library"> 57 <Project name="OpenSim.Framework.Console" path="OpenSim/Framework/Console" type="Library">
58 <Configuration name="Debug"> 58 <Configuration name="Debug">
@@ -196,7 +196,6 @@
196 </Files> 196 </Files>
197 </Project> 197 </Project>
198 198
199
200 <Project name="OpenSim.Data" path="OpenSim/Data" type="Library"> 199 <Project name="OpenSim.Data" path="OpenSim/Data" type="Library">
201 <Configuration name="Debug"> 200 <Configuration name="Debug">
202 <Options> 201 <Options>
@@ -224,7 +223,7 @@
224 </Files> 223 </Files>
225 </Project> 224 </Project>
226 225
227 226
228 <Project name="OpenSim.Data.MySQLMapper" path="OpenSim/Data/MySQLMapper" type="Library"> 227 <Project name="OpenSim.Data.MySQLMapper" path="OpenSim/Data/MySQLMapper" type="Library">
229 <Configuration name="Debug"> 228 <Configuration name="Debug">
230 <Options> 229 <Options>
@@ -495,7 +494,6 @@
495 </Files> 494 </Files>
496 </Project> 495 </Project>
497 496
498
499 <!-- Physics Plug-ins --> 497 <!-- Physics Plug-ins -->
500 <Project name="OpenSim.Region.Physics.BasicPhysicsPlugin" path="OpenSim/Region/Physics/BasicPhysicsPlugin" type="Library"> 498 <Project name="OpenSim.Region.Physics.BasicPhysicsPlugin" path="OpenSim/Region/Physics/BasicPhysicsPlugin" type="Library">
501 <Configuration name="Debug"> 499 <Configuration name="Debug">
@@ -867,8 +865,7 @@
867 </Files> 865 </Files>
868 </Project> 866 </Project>
869 867
870 868 <Project name="OpenSim.Region.Modules.AvatarFactory" path="OpenSim/Region/Modules/AvatarFactory" type="Library">
871 <Project name="OpenSim.Region.Modules.AvatarFactory" path="OpenSim/Region/Modules/AvatarFactory" type="Library">
872 <Configuration name="Debug"> 869 <Configuration name="Debug">
873 <Options> 870 <Options>
874 <OutputPath>../../../../bin/</OutputPath> 871 <OutputPath>../../../../bin/</OutputPath>
@@ -897,8 +894,7 @@
897 </Files> 894 </Files>
898 </Project> 895 </Project>
899 896
900 897 <Project name="OpenSim.Region.Modules.Terrain.Extensions.DefaultEffects" path="OpenSim/Region/Modules/Terrain/Extensions/DefaultEffects" type="Library">
901 <Project name="OpenSim.Region.Modules.Terrain.Extensions.DefaultEffects" path="OpenSim/Region/Modules/Terrain/Extensions/DefaultEffects" type="Library">
902 <Configuration name="Debug"> 898 <Configuration name="Debug">
903 <Options> 899 <Options>
904 <OutputPath>../../../../../../bin/Terrain/</OutputPath> 900 <OutputPath>../../../../../../bin/Terrain/</OutputPath>
@@ -919,8 +915,7 @@
919 </Files> 915 </Files>
920 </Project> 916 </Project>
921 917
922 918 <Project name="OpenSim.Region.Modules.SvnSerialiser" path="OpenSim/Region/Modules/SvnSerialiser" type="Library">
923 <Project name="OpenSim.Region.Modules.SvnSerialiser" path="OpenSim/Region/Modules/SvnSerialiser" type="Library">
924 <Configuration name="Debug"> 919 <Configuration name="Debug">
925 <Options> 920 <Options>
926 <OutputPath>../../../../bin/</OutputPath> 921 <OutputPath>../../../../bin/</OutputPath>
@@ -942,8 +937,8 @@
942 <Reference name="OpenSim.Data.Base" /> 937 <Reference name="OpenSim.Data.Base" />
943 <Reference name="OpenSim.Region.Environment"/> 938 <Reference name="OpenSim.Region.Environment"/>
944 <Reference name="Nini.dll" /> 939 <Reference name="Nini.dll" />
945 <Reference name="PumaCode.SvnDotNet.dll" /> 940 <Reference name="PumaCode.SvnDotNet.dll" />
946 <Reference name="log4net"/> 941 <Reference name="log4net"/>
947 <Files> 942 <Files>
948 <Match pattern="*.cs" recurse="true"/> 943 <Match pattern="*.cs" recurse="true"/>
949 </Files> 944 </Files>
@@ -1101,7 +1096,7 @@
1101 <Reference name="OpenSim"/> 1096 <Reference name="OpenSim"/>
1102 <Reference name="OpenSim.Region.ClientStack"/> 1097 <Reference name="OpenSim.Region.ClientStack"/>
1103 <Reference name="OpenSim.Region.Environment"/> 1098 <Reference name="OpenSim.Region.Environment"/>
1104 <Reference name="OpenSim.Framework.Communications"/> 1099 <Reference name="OpenSim.Framework.Communications"/>
1105 <Reference name="OpenSim.Framework"/> 1100 <Reference name="OpenSim.Framework"/>
1106 <Reference name="OpenSim.Framework.Servers"/> 1101 <Reference name="OpenSim.Framework.Servers"/>
1107 <Reference name="OpenSim.Framework.Console"/> 1102 <Reference name="OpenSim.Framework.Console"/>
@@ -1115,32 +1110,32 @@
1115 <!-- Scene Server API Example Apps --> 1110 <!-- Scene Server API Example Apps -->
1116 1111
1117 <Project name="OpenSim.Region.DataSnapshot" path="OpenSim/Region/DataSnapshot" type="Library"> 1112 <Project name="OpenSim.Region.DataSnapshot" path="OpenSim/Region/DataSnapshot" type="Library">
1118 <Configuration name="Debug"> 1113 <Configuration name="Debug">
1119 <Options> 1114 <Options>
1120 <OutputPath>../../../bin/</OutputPath> 1115 <OutputPath>../../../bin/</OutputPath>
1121 </Options> 1116 </Options>
1122 </Configuration> 1117 </Configuration>
1123 <Configuration name="Release"> 1118 <Configuration name="Release">
1124 <Options> 1119 <Options>
1125 <OutputPath>../../../bin/</OutputPath> 1120 <OutputPath>../../../bin/</OutputPath>
1126 </Options> 1121 </Options>
1127 </Configuration> 1122 </Configuration>
1128 1123
1129 <ReferencePath>../../../bin/</ReferencePath> 1124 <ReferencePath>../../../bin/</ReferencePath>
1130 <Reference name="System" localCopy="false"/> 1125 <Reference name="System" localCopy="false"/>
1131 <Reference name="System.Xml"/> 1126 <Reference name="System.Xml"/>
1132 <Reference name="System.Data"/> 1127 <Reference name="System.Data"/>
1133 <Reference name="OpenSim.Framework"/> 1128 <Reference name="OpenSim.Framework"/>
1134 <Reference name="OpenSim.Framework.Communications"/> 1129 <Reference name="OpenSim.Framework.Communications"/>
1135 <Reference name="OpenSim.Framework.Console"/> 1130 <Reference name="OpenSim.Framework.Console"/>
1136 <Reference name="OpenSim.Framework.Servers"/> 1131 <Reference name="OpenSim.Framework.Servers"/>
1137 <Reference name="OpenSim.Region.Environment"/> 1132 <Reference name="OpenSim.Region.Environment"/>
1138 <Reference name="libsecondlife.dll"/> 1133 <Reference name="libsecondlife.dll"/>
1139 <Reference name="Nini.dll" /> 1134 <Reference name="Nini.dll" />
1140 <Reference name="log4net.dll" /> 1135 <Reference name="log4net.dll" />
1141 <Files> 1136 <Files>
1142 <Match pattern="*.cs" recurse="true"/> 1137 <Match pattern="*.cs" recurse="true"/>
1143 </Files> 1138 </Files>
1144 </Project> 1139 </Project>
1145 1140
1146 <Project name="OpenSim.Region.Examples.SimpleModule" path="OpenSim/Region/Examples/SimpleModule" type="Library"> 1141 <Project name="OpenSim.Region.Examples.SimpleModule" path="OpenSim/Region/Examples/SimpleModule" type="Library">
generated by cgit v1.1 at 2024-12-15 22:42:22 +0000