Diva Canto
292752bb78
MapImage security issue: better error messages
2012-04-27 10:22:43 -07:00
Diva Canto
ac64fe03d8
Amend to last commit: account for the existence of proxies.
2012-04-27 09:59:46 -07:00
Diva Canto
2970a18e54
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-27 09:26:14 -07:00
Diva Canto
c84f63f4dc
Minor change in error message (HG teleport failures)
2012-04-27 09:24:50 -07:00
Diva Canto
e4e754ee93
MapImageService: added an additional security check for OSGrid and other grids like it.
2012-04-27 09:23:56 -07:00
Melanie
90305001de
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-04-27 17:09:49 +01:00
UbitUmarov
ee237fc5df
test
2012-04-27 12:19:22 +01:00
UbitUmarov
8ef7df5a56
test
2012-04-27 11:01:34 +01:00
UbitUmarov
2006188ee5
test
2012-04-27 10:49:32 +01:00
UbitUmarov
2419de2b6d
test
2012-04-27 10:10:31 +01:00
UbitUmarov
fedc9eb105
itest
2012-04-27 09:50:53 +01:00
UbitUmarov
1c735facee
test
2012-04-27 09:23:20 +01:00
UbitUmarov
cadbfcc011
itest
2012-04-27 09:15:31 +01:00
UbitUmarov
b948826b7e
test
2012-04-27 09:09:29 +01:00
UbitUmarov
7a7f4b7722
testing
2012-04-27 09:00:30 +01:00
UbitUmarov
03450dee39
testing....
2012-04-27 08:11:18 +01:00
UbitUmarov
6edbbdc83a
ubitODE fix don't report colisions with a volume detector ( only report to it )
2012-04-27 06:00:50 +01:00
UbitUmarov
e974d493c6
testing
2012-04-27 03:44:15 +01:00
UbitUmarov
d8f691664a
testing
2012-04-27 03:36:49 +01:00
UbitUmarov
76d9040ed4
testing
2012-04-27 02:54:39 +01:00
UbitUmarov
911bc81b00
testing
2012-04-27 02:13:54 +01:00
UbitUmarov
a64a9e48de
TESTING
2012-04-27 01:43:27 +01:00
Melanie
7397c9a68e
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-04-27 01:31:12 +01:00
UbitUmarov
30ab9647ba
TEST more changes
2012-04-27 01:24:44 +01:00
UbitUmarov
61e99fba87
TEST more options to avnLocalTeleport
2012-04-27 01:18:30 +01:00
UbitUmarov
2cf6023892
TEST added avnLocalTeleport(Vector3 newpos, Quaternion? newrot, bool Stopped) to scenepresence.cs
2012-04-27 01:06:07 +01:00
Justin Clark-Casey (justincc)
07e62df558
Add regression test for teleporting an agent between separated regions on the same simulator.
...
This involves a large amount of change in test scene setup code to allow test scenes to share shared modules
SetupScene is now an instance method that requires an instantiation of SceneHelpers, though other SceneHelpers methods are still static
May split these out into separate classes in the future.
2012-04-27 00:58:54 +01:00
Oren Hurvitz
8a65f5a70d
OSSL: Removed check for CanRunConsoleCommand() in osKickAvatar.
...
OSSL permissions are now controlled in OpenSim.ini.
2012-04-26 22:53:13 +01:00
Oren Hurvitz
0da8fe3124
Refactored how asset/inventory types are associated with content types: gathered all the knowledge into a single class. Added the Mesh content type.
2012-04-26 22:49:14 +01:00
Oren Hurvitz
ee13d817f1
When creating an OAR, objects where the user is the Creator are always included, regardless of their permissions.
...
The purpose of the permission checks is to prevent the unauthorized copying of assets, but users can always copy assets that they created.
2012-04-26 22:41:31 +01:00
Justin Clark-Casey (justincc)
cb6791fb30
Tweak log messages on local region to region teleport path to help with problem resolution.
2012-04-26 22:35:25 +01:00
Justin Clark-Casey (justincc)
d19aa9e792
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-26 21:54:50 +01:00
BlueWall
2542ca2a49
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-26 16:40:36 -04:00
BlueWall
fba802bb03
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-04-26 16:13:47 -04:00
Talun
b8114d2b67
Add a version of osNpcSay that takes a channel number Mantis 5747
...
osNpcSay(UUID npc, string message) left untouched
New functions:-
osNpcSay(UUID npc, int channel, string message)
osNpcShout(UUID npc, int channel, string message)
osNpcWhisper(UUID npc, int channel, string message)
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-04-26 16:13:29 -04:00
UbitUmarov
fc576df273
revert last add commit
2012-04-26 18:24:36 +01:00
UbitUmarov
f194c48cd3
add wearable type PHYSICS
2012-04-26 17:42:11 +01:00
Justin Clark-Casey (justincc)
ca228c4770
Comment out old Scene.HandleLogOffUserFromGrid() to reduce client closing analysis complexity
2012-04-26 16:20:53 +01:00
UbitUmarov
fd19601c6b
Help big boobies to dance (avatar visualParams). May not persist and need more lobe ?
2012-04-26 16:17:46 +01:00
Justin Clark-Casey (justincc)
f49912f92a
minor: Add more detail to unauthorized caps client message
2012-04-26 16:10:24 +01:00
Justin Clark-Casey (justincc)
b0cbf16c19
minor: Add region name to dropped inbound packet message
2012-04-26 16:04:49 +01:00
Justin Clark-Casey (justincc)
4c4ffb9868
Add request verb and url to error messages in WebUtil that lack this.
...
Make exception printing consistent across windows and mono.
2012-04-26 00:43:31 +01:00
Justin Clark-Casey (justincc)
e52fe03fff
minor: Add avatar name to removing agent log message
2012-04-26 00:42:37 +01:00
Justin Clark-Casey (justincc)
74dbfe6bb5
Comment out avatar move to target message for now.
2012-04-25 23:46:42 +01:00
Mic Bowman
133370f158
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-25 11:57:29 -07:00
Mic Bowman
a2d544c938
Add a configuration switch to turn on/off the use of the trash
...
folder when deleting objects from a scene. The use of the trash
folder causes assets to be created and stored everytime you delete
an object from the scene (slows down the delete and adds mostly useless
assets to your database).
Default is on (use the trash folder) which is the standard behavior.
2012-04-25 11:54:57 -07:00
Melanie
db31c9fe58
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-04-25 19:15:40 +01:00
Melanie
d676bc350d
Merge branch 'master' into careminster
2012-04-25 19:11:26 +01:00
Melanie
88553bb884
Port Avination link order to make OpenSim behave like SL. Make Primstar scripts work. Fixes Mantis #5990
2012-04-25 19:09:22 +01:00
Melanie
b62eee2f0b
Merge branch 'master' into careminster
2012-04-25 18:55:51 +01:00