aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMW2008-04-01 13:34:33 +0000
committerMW2008-04-01 13:34:33 +0000
commitcdf27ece5fa1f7a48e3275d15dc32e16c3835667 (patch)
treeb56451af468d8a01a0948e4774c234cba90e2b66
parenta few small changes (diff)
downloadopensim-SC_OLD-cdf27ece5fa1f7a48e3275d15dc32e16c3835667.zip
opensim-SC_OLD-cdf27ece5fa1f7a48e3275d15dc32e16c3835667.tar.gz
opensim-SC_OLD-cdf27ece5fa1f7a48e3275d15dc32e16c3835667.tar.bz2
opensim-SC_OLD-cdf27ece5fa1f7a48e3275d15dc32e16c3835667.tar.xz
few more minor changes, needs prebuild to be ran.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs5
-rw-r--r--OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs6
-rw-r--r--OpenSim/Region/Examples/SimpleModule/RegionModule.cs6
-rw-r--r--prebuild.xml4
4 files changed, 8 insertions, 13 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 6562768..3b7923e 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -2396,11 +2396,6 @@ namespace OpenSim.Region.ClientStack
2396 else 2396 else
2397 { 2397 {
2398 LLUUID partId = part.UUID; 2398 LLUUID partId = part.UUID;
2399
2400
2401
2402
2403
2404 UpdatePrimRotation handlerUpdatePrimRotation = OnUpdatePrimGroupRotation; 2399 UpdatePrimRotation handlerUpdatePrimRotation = OnUpdatePrimGroupRotation;
2405 UpdatePrimGroupRotation handlerUpdatePrimGroupRotation = OnUpdatePrimGroupMouseRotation; 2400 UpdatePrimGroupRotation handlerUpdatePrimGroupRotation = OnUpdatePrimGroupMouseRotation;
2406 2401
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index 8fcc3cf..3f090df 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -194,10 +194,10 @@ namespace OpenSim.Region.Examples.SimpleModule
194 194
195 public virtual string FirstName 195 public virtual string FirstName
196 { 196 {
197 get { return "Annoying"; } 197 get { return "Only"; }
198 } 198 }
199 199
200 private string lastName = "NPC" + Util.RandomClass.Next(1, 1000); 200 private string lastName = "Today" + Util.RandomClass.Next(1, 1000);
201 201
202 public virtual string LastName 202 public virtual string LastName
203 { 203 {
@@ -485,7 +485,7 @@ namespace OpenSim.Region.Examples.SimpleModule
485 if (OnChatFromViewer != null) 485 if (OnChatFromViewer != null)
486 { 486 {
487 ChatFromViewerArgs args = new ChatFromViewerArgs(); 487 ChatFromViewerArgs args = new ChatFromViewerArgs();
488 args.Message = "Kinda quiet around here, isn't it?"; 488 args.Message = "Hey You! Get out of my Home. This is my Region";
489 args.Channel = 0; 489 args.Channel = 0;
490 args.From = FirstName + " " + LastName; 490 args.From = FirstName + " " + LastName;
491 args.Position = new LLVector3(128, 128, 26); 491 args.Position = new LLVector3(128, 128, 26);
diff --git a/OpenSim/Region/Examples/SimpleModule/RegionModule.cs b/OpenSim/Region/Examples/SimpleModule/RegionModule.cs
index 1e043dd..218908c 100644
--- a/OpenSim/Region/Examples/SimpleModule/RegionModule.cs
+++ b/OpenSim/Region/Examples/SimpleModule/RegionModule.cs
@@ -54,10 +54,10 @@ namespace OpenSim.Region.Examples.SimpleModule
54 54
55 LLVector3 pos = new LLVector3(110, 129, 27); 55 LLVector3 pos = new LLVector3(110, 129, 27);
56 56
57 AddCpuCounter(regionInfo, pos); 57 //AddCpuCounter(regionInfo, pos);
58 // AddComplexObjects(regionInfo, pos); 58 // AddComplexObjects(regionInfo, pos);
59 AddAvatars(); 59 AddAvatars();
60 AddFileSystemObjects(); 60 // AddFileSystemObjects();
61 } 61 }
62 62
63 private void AddFileSystemObjects() 63 private void AddFileSystemObjects()
@@ -85,7 +85,7 @@ namespace OpenSim.Region.Examples.SimpleModule
85 85
86 private void AddAvatars() 86 private void AddAvatars()
87 { 87 {
88 for (int i = 0; i < 2; i++) 88 for (int i = 0; i < 1; i++)
89 { 89 {
90 MyNpcCharacter m_character = new MyNpcCharacter(m_scene.EventManager); 90 MyNpcCharacter m_character = new MyNpcCharacter(m_scene.EventManager);
91 m_scene.AddNewClient(m_character, false); 91 m_scene.AddNewClient(m_character, false);
diff --git a/prebuild.xml b/prebuild.xml
index c7f6c5f..40112cc 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1076,12 +1076,12 @@
1076 <Project name="OpenSim.Region.Examples.SimpleModule" path="OpenSim/Region/Examples/SimpleModule" type="Library"> 1076 <Project name="OpenSim.Region.Examples.SimpleModule" path="OpenSim/Region/Examples/SimpleModule" type="Library">
1077 <Configuration name="Debug"> 1077 <Configuration name="Debug">
1078 <Options> 1078 <Options>
1079 <OutputPath>bin/</OutputPath> 1079 <OutputPath>../../../../bin/</OutputPath>
1080 </Options> 1080 </Options>
1081 </Configuration> 1081 </Configuration>
1082 <Configuration name="Release"> 1082 <Configuration name="Release">
1083 <Options> 1083 <Options>
1084 <OutputPath>bin/</OutputPath> 1084 <OutputPath>../../../../bin/</OutputPath>
1085 </Options> 1085 </Options>
1086 </Configuration> 1086 </Configuration>
1087 1087