diff options
author | Melanie | 2010-06-19 20:32:01 +0100 |
---|---|---|
committer | Melanie | 2010-06-19 20:32:01 +0100 |
commit | 04b60aa49067060779cd541e9a06ad947bfecd08 (patch) | |
tree | d0da6005a2457640f433fe1b313e36cb71cc3976 | |
parent | Allow moving an avatar as part of a linkset using llSetLinkPrimitiveParams. T... (diff) | |
parent | Bug fix: wrong name of requester in local friendship offer. (diff) | |
download | opensim-SC-04b60aa49067060779cd541e9a06ad947bfecd08.zip opensim-SC-04b60aa49067060779cd541e9a06ad947bfecd08.tar.gz opensim-SC-04b60aa49067060779cd541e9a06ad947bfecd08.tar.bz2 opensim-SC-04b60aa49067060779cd541e9a06ad947bfecd08.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 1 | ||||
-rw-r--r-- | README.txt | 59 | ||||
-rw-r--r-- | bin/OpenSim.ini.example | 6 | ||||
-rw-r--r-- | bin/Robust.HG.ini.example | 2 | ||||
-rw-r--r-- | bin/config-include/GridCommon.ini.example | 8 |
7 files changed, 55 insertions, 30 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs index 4c01985..c6f8b88 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |||
@@ -504,7 +504,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
504 | UUID principalID = new UUID(im.fromAgentID); | 504 | UUID principalID = new UUID(im.fromAgentID); |
505 | UUID friendID = new UUID(im.toAgentID); | 505 | UUID friendID = new UUID(im.toAgentID); |
506 | 506 | ||
507 | m_log.DebugFormat("[FRIENDS]: {0} offered friendship to {1}", principalID, friendID); | 507 | m_log.DebugFormat("[FRIENDS]: {0} ({1}) offered friendship to {2}", principalID, im.fromAgentName, friendID); |
508 | 508 | ||
509 | // This user wants to be friends with the other user. | 509 | // This user wants to be friends with the other user. |
510 | // Let's add the relation backwards, in case the other is not online | 510 | // Let's add the relation backwards, in case the other is not online |
@@ -522,6 +522,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
522 | im.imSessionID = im.fromAgentID; | 522 | im.imSessionID = im.fromAgentID; |
523 | 523 | ||
524 | // Try the local sim | 524 | // Try the local sim |
525 | UserAccount account = UserAccountService.GetUserAccount(Scene.RegionInfo.ScopeID, agentID); | ||
526 | im.fromAgentName = (account == null) ? "Unknown" : account.FirstName + " " + account.LastName; | ||
527 | |||
525 | if (LocalFriendshipOffered(friendID, im)) | 528 | if (LocalFriendshipOffered(friendID, im)) |
526 | return; | 529 | return; |
527 | 530 | ||
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index b80a557..7403fed 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -1498,6 +1498,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
1498 | DoPhysicsPropertyUpdate(RigidBody, true); | 1498 | DoPhysicsPropertyUpdate(RigidBody, true); |
1499 | PhysActor.SetVolumeDetect(VolumeDetectActive ? 1 : 0); | 1499 | PhysActor.SetVolumeDetect(VolumeDetectActive ? 1 : 0); |
1500 | } | 1500 | } |
1501 | else | ||
1502 | { | ||
1503 | m_log.DebugFormat("[SPEW]: physics actor is null for {0} with parent {1}", UUID, this.ParentGroup.UUID); | ||
1504 | } | ||
1501 | } | 1505 | } |
1502 | } | 1506 | } |
1503 | } | 1507 | } |
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index 100f98d..7fd59a0 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
@@ -1781,6 +1781,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1781 | m_log.ErrorFormat("[PHYSICS]: Exception while meshing prim {0}.", primName); | 1781 | m_log.ErrorFormat("[PHYSICS]: Exception while meshing prim {0}.", primName); |
1782 | m_log.Debug(e.ToString()); | 1782 | m_log.Debug(e.ToString()); |
1783 | mesh = null; | 1783 | mesh = null; |
1784 | return null; | ||
1784 | } | 1785 | } |
1785 | } | 1786 | } |
1786 | 1787 | ||
@@ -1,6 +1,8 @@ | |||
1 | Welcome to OpenSim! | 1 | Welcome to OpenSim! |
2 | 2 | ||
3 | ================ | ||
3 | === OVERVIEW === | 4 | === OVERVIEW === |
5 | ================ | ||
4 | 6 | ||
5 | OpenSim is a BSD Licensed Open Source project to develop a functioning | 7 | OpenSim is a BSD Licensed Open Source project to develop a functioning |
6 | virtual worlds server platform capable of supporting multiple clients | 8 | virtual worlds server platform capable of supporting multiple clients |
@@ -10,16 +12,19 @@ C#, and can run under Mono or the Microsoft .NET runtimes. | |||
10 | This is considered an alpha release. Some stuff works, a lot doesn't. | 12 | This is considered an alpha release. Some stuff works, a lot doesn't. |
11 | If it breaks, you get to keep *both* pieces. | 13 | If it breaks, you get to keep *both* pieces. |
12 | 14 | ||
15 | ========================= | ||
13 | === Compiling OpenSim === | 16 | === Compiling OpenSim === |
17 | ========================= | ||
14 | 18 | ||
15 | Please see BUILDING.txt if you downloaded a source distribution and | 19 | Please see BUILDING.txt if you downloaded a source distribution and |
16 | need to build OpenSim before running it. | 20 | need to build OpenSim before running it. |
17 | 21 | ||
22 | ================================== | ||
18 | === Running OpenSim on Windows === | 23 | === Running OpenSim on Windows === |
24 | ================================== | ||
19 | 25 | ||
20 | We recommend that you run OpenSim from a command prompt on Windows in order | 26 | We recommend that you run OpenSim from a command prompt on Windows in order |
21 | to capture any errors, though you can also run it by double-clicking | 27 | to capture any errors. |
22 | bin/OpenSim.exe | ||
23 | 28 | ||
24 | To run OpenSim from a command prompt | 29 | To run OpenSim from a command prompt |
25 | 30 | ||
@@ -28,7 +33,9 @@ To run OpenSim from a command prompt | |||
28 | 33 | ||
29 | Now see the "Configuring OpenSim" section | 34 | Now see the "Configuring OpenSim" section |
30 | 35 | ||
36 | ================================ | ||
31 | === Running OpenSim on Linux === | 37 | === Running OpenSim on Linux === |
38 | ================================ | ||
32 | 39 | ||
33 | You will need Mono >= 2.4.2 to run OpenSim. On some Linux distributions you | 40 | You will need Mono >= 2.4.2 to run OpenSim. On some Linux distributions you |
34 | may need to install additional packages. See http://opensimulator.org/wiki/Dependencies | 41 | may need to install additional packages. See http://opensimulator.org/wiki/Dependencies |
@@ -37,48 +44,63 @@ for more information. | |||
37 | To run OpenSim, from the unpacked distribution type: | 44 | To run OpenSim, from the unpacked distribution type: |
38 | 45 | ||
39 | * cd bin | 46 | * cd bin |
40 | * mono ./OpenSim.exe | 47 | * mono OpenSim.exe |
41 | 48 | ||
42 | Now see the "Configuring OpenSim" section | 49 | Now see the "Configuring OpenSim" section |
43 | 50 | ||
51 | =========================== | ||
44 | === Configuring OpenSim === | 52 | === Configuring OpenSim === |
53 | =========================== | ||
45 | 54 | ||
46 | When OpenSim starts for the first time, you will be prompted with a | 55 | When OpenSim starts for the first time, you will be prompted with a |
47 | series of questions that look something like: | 56 | series of questions that look something like: |
48 | 57 | ||
49 | [09-17 03:54:40] DEFAULT REGION CONFIG: Simulator Name [OpenSim Test]: | 58 | [09-17 03:54:40] DEFAULT REGION CONFIG: Simulator Name [OpenSim Test]: |
50 | 59 | ||
51 | At each of these you must provide you own value or just hit enter to | 60 | For all the options except simulator name, you can safely hit enter to accept |
52 | take the default (in this case "OpenSim Test"). | 61 | the default if you want to connect using a client on the same machine or over |
62 | your local network. | ||
53 | 63 | ||
54 | YOUR SIM WILL NOT BE STARTED UNTIL YOU ANSWER ALL QUESTIONS | 64 | You will then be asked "Do you wish to join an existing estate?". If you're |
65 | starting OpenSim for the first time then answer no (which is the default) and | ||
66 | provide an estate name. | ||
67 | |||
68 | Shortly afterwards, you will then be asked to enter an estate owner first name, | ||
69 | last name, password and e-mail (which can be left blank). Do not forget these | ||
70 | details, since initially only this account will be able to manage your region | ||
71 | in-world. You can also use these details to perform your first login. | ||
55 | 72 | ||
56 | Once you are presented with a prompt that looks like: | 73 | Once you are presented with a prompt that looks like: |
57 | 74 | ||
58 | Region# : | 75 | Region (My region name) # |
59 | 76 | ||
60 | You have successfully started OpenSim. | 77 | You have successfully started OpenSim. |
61 | 78 | ||
62 | Before you can log in you will need to create a user account if you didn't already create | 79 | If you want to create another user account to login rather than the estate |
63 | your user as the "Master Avatar" during the region configuration stage. You can do | 80 | account, then type "create user" on the OpenSim console and follow the prompts. |
64 | this by running the "create user" command on the OpenSim console. This will | ||
65 | ask you a series of questions such as first name, last name and password. | ||
66 | 81 | ||
67 | Helpful resources: | 82 | Helpful resources: |
68 | * http://opensimulator.org/wiki/Configuration | 83 | * http://opensimulator.org/wiki/Configuration |
69 | * http://opensimulator.org/wiki/Configuring_Regions | 84 | * http://opensimulator.org/wiki/Configuring_Regions |
70 | * http://opensimulator.org/wiki/Mysql-config | ||
71 | 85 | ||
86 | ================================== | ||
72 | === Connecting to your OpenSim === | 87 | === Connecting to your OpenSim === |
88 | ================================== | ||
89 | |||
90 | By default your sim will be available for login on port 9000. You can login by | ||
91 | adding -loginuri http://127.0.0.1:9000 to the command that starts Second Life | ||
92 | (e.g. in the Target: box of the client icon properties on Windows). You can | ||
93 | also login using the network IP address of the machine running OpenSim (e.g. | ||
94 | http://192.168.1.2:9000) | ||
73 | 95 | ||
74 | By default your sim will be running on http://127.0.0.1:9000. To use | 96 | To login, use the avatar details that you gave for your estate ownership or the |
75 | your OpenSim add -loginuri http://127.0.0.1:9000 to your second life | 97 | one you set up using the "create user" command. |
76 | client (running on the same machine as your OpenSim). To login, use the | ||
77 | same avatar details that you gave to the "create user" console command. | ||
78 | 98 | ||
99 | =================== | ||
79 | === Bug reports === | 100 | === Bug reports === |
101 | =================== | ||
80 | 102 | ||
81 | In the likely event of bugs biting you (err, your OpenSim) we | 103 | In the very likely event of bugs biting you (err, your OpenSim) we |
82 | encourage you to see whether the problem has already been reported on | 104 | encourage you to see whether the problem has already been reported on |
83 | the OpenSim mantis system. You can find the OpenSim mantis system at | 105 | the OpenSim mantis system. You can find the OpenSim mantis system at |
84 | 106 | ||
@@ -97,11 +119,12 @@ mantis"). Useful information to include: | |||
97 | 119 | ||
98 | mono --debug OpenSim.exe | 120 | mono --debug OpenSim.exe |
99 | 121 | ||
122 | =================================== | ||
100 | === More Information on OpenSim === | 123 | === More Information on OpenSim === |
124 | =================================== | ||
101 | 125 | ||
102 | More extensive information on building, running, and configuring | 126 | More extensive information on building, running, and configuring |
103 | OpenSim, as well as how to report bugs, and participate in the OpenSim | 127 | OpenSim, as well as how to report bugs, and participate in the OpenSim |
104 | project can always be found at http://opensimulator.org. | 128 | project can always be found at http://opensimulator.org. |
105 | 129 | ||
106 | Thanks for trying OpenSim, we hope it is a pleasant experience. | 130 | Thanks for trying OpenSim, we hope it is a pleasant experience. |
107 | \ No newline at end of file | ||
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index db4c9a6..7846d71 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
@@ -80,14 +80,16 @@ | |||
80 | PhysicalPrimMax = 10 ; (I think this was moved to the Regions.ini!) | 80 | PhysicalPrimMax = 10 ; (I think this was moved to the Regions.ini!) |
81 | ClampPrimSize = false | 81 | ClampPrimSize = false |
82 | 82 | ||
83 | ; Region crossing | 83 | ; Allow scripts to cross region boundaries. These are recompiled on the new region. |
84 | AllowScriptCrossing = false | 84 | AllowScriptCrossing = false |
85 | |||
86 | ; Allow compiled script binary code to cross region boundaries. | ||
85 | ; If you set this to "true", any region that can teleport to you can | 87 | ; If you set this to "true", any region that can teleport to you can |
86 | ; inject ARBITRARY BINARY CODE into your system. Use at your own risk. | 88 | ; inject ARBITRARY BINARY CODE into your system. Use at your own risk. |
87 | ; YOU HAVE BEEN WARNED!!! | 89 | ; YOU HAVE BEEN WARNED!!! |
88 | TrustBinaries = false | 90 | TrustBinaries = false |
89 | 91 | ||
90 | ; Combine all contiguous regions into one large region | 92 | ; Combine all contiguous regions into one large megaregion |
91 | ; Order your regions from South to North, West to East in your regions.ini and then set this to true | 93 | ; Order your regions from South to North, West to East in your regions.ini and then set this to true |
92 | ; Warning! Don't use this with regions that have existing content!, This will likely break them | 94 | ; Warning! Don't use this with regions that have existing content!, This will likely break them |
93 | CombineContiguousRegions = false | 95 | CombineContiguousRegions = false |
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index 9830d38..39228eb 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example | |||
@@ -1,7 +1,7 @@ | |||
1 | ;; Configurations for enabling HG1.5 | 1 | ;; Configurations for enabling HG1.5 |
2 | ;; | 2 | ;; |
3 | ;; Run | 3 | ;; Run |
4 | ;; $ OpenSim.Server.exe -inifile OpenSim.Server.HG.ini | 4 | ;; $ Robust.exe -inifile Robust.HG.ini |
5 | 5 | ||
6 | ;; HG1.5 handlers are: OpenSim.Server.Handlers.dll:GatekeeperService | 6 | ;; HG1.5 handlers are: OpenSim.Server.Handlers.dll:GatekeeperService |
7 | ;; OpenSim.Server.Handlers.dll:UserAgentService | 7 | ;; OpenSim.Server.Handlers.dll:UserAgentService |
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example index 88ac5e2..a19591b 100644 --- a/bin/config-include/GridCommon.ini.example +++ b/bin/config-include/GridCommon.ini.example | |||
@@ -8,7 +8,6 @@ | |||
8 | ; | 8 | ; |
9 | AssetServerURI = "http://myassetserver.com:8003" | 9 | AssetServerURI = "http://myassetserver.com:8003" |
10 | 10 | ||
11 | |||
12 | [InventoryService] | 11 | [InventoryService] |
13 | ; | 12 | ; |
14 | ; change this to your grid-wide inventory server | 13 | ; change this to your grid-wide inventory server |
@@ -58,13 +57,6 @@ | |||
58 | ; | 57 | ; |
59 | FriendsServerURI = "http://mygridserver.com:8003" | 58 | FriendsServerURI = "http://mygridserver.com:8003" |
60 | 59 | ||
61 | [Groups] | ||
62 | ; | ||
63 | ; change this to your grid-wide groups server | ||
64 | ; | ||
65 | GroupsServerURI = "http://mygridserver.com:82/Grid/" | ||
66 | |||
67 | |||
68 | [Modules] | 60 | [Modules] |
69 | ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists. | 61 | ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists. |
70 | ;; Copy the config .example file into your own .ini file and change configs there | 62 | ;; Copy the config .example file into your own .ini file and change configs there |