Melanie
|
9534d5f929
|
Merge branch 'master' into careminster
|
2013-02-22 01:28:54 +00:00 |
|
Justin Clark-Casey (justincc)
|
8a6f2432fc
|
minor: remove some mono compiler warnings in OpenSim.Region.ClientStack.Linden.Caps.dll
|
2013-02-20 00:01:20 +00:00 |
|
Melanie
|
72c925a6c9
|
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Framework/WebUtil.cs
OpenSim/Region/Physics/OdePlugin/OdeScene.cs
|
2012-10-18 20:56:34 +01:00 |
|
Melanie
|
322eefbb6f
|
Allow the console to be used by gods as well as region owners.
|
2012-10-17 01:31:05 +02:00 |
|
Melanie
|
fa52effb27
|
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
|
2012-10-16 04:30:01 +01:00 |
|
Justin Clark-Casey (justincc)
|
8c2564c05c
|
minor: Comment out the region console caps message for now.
|
2012-10-16 00:40:28 +01:00 |
|
Melanie
|
0a959343a5
|
Make the console output from the reigon console hookable
|
2012-08-18 22:36:48 +02:00 |
|
Melanie
|
f6562e2269
|
Actually add the module
|
2012-08-14 22:22:25 +01:00 |
|
Melanie
|
f21fdff4f9
|
Actually add the module
|
2012-08-14 21:58:07 +02:00 |
|