BlueWall
9784b6fa75
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-04-27 16:22:13 -04:00
BlueWall
db566fbb09
Fix prebuild.xml
...
adding a reference to a dll requires 'path="..."'
2012-04-27 16:17:46 -04:00
Oren Hurvitz
6473674bbf
Fixed: custom walking animations didn't stop when the avatar stopped walking.
...
This happened because the scripts were notified about control changes (e.g., the user stopped pressing the Forward key) when the animation was still WALK, so the script didn't stop the walking animation. Fixing this required: a) Update the movement animation *before* notifying the script; b) Add locking to prevent clashes with the Heartbeat thread (which also updates the animations); c) Handle the case of a user who stops walking just as the avatar is in the air: the avatar should STAND in that case, not WALK.
This reverts commit feef1dd732
.
2012-04-27 20:47:02 +01:00
BlueWall
515b7eabbd
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-04-27 15:41:53 -04:00
BlueWall
d00df295d6
Converting more functions to new style for REST/Console
2012-04-27 15:41:21 -04:00
Oren Hurvitz
9622e8ac72
If a Grid God teleports then include the Godlike teleport flag. This can affect the starting position in the destination region.
2012-04-27 20:22:35 +01:00
Oren Hurvitz
37d770f814
Use DotNetZip to compress OARs and IARs.
...
DotNetZip provides much better compression than standard .NET.
2012-04-27 19:46:31 +01:00
Justin Clark-Casey (justincc)
9d1791def8
Add Stefan_Boom / stoehr to contributors
2012-04-27 19:42:12 +01:00
Justin Clark-Casey (justincc)
e39e4f6bfb
minor: style adjustments in SensorRepeat, mainly related to patch from stoehr
2012-04-27 19:40:19 +01:00
Stefan_Boom
b35a1d5681
Fixing wrong position of llSensor, SensePoint wasnt following the rotation of the root prim.
2012-04-27 19:31:50 +01:00
Diva Canto
9bc94c502a
MapImageService: changed the event at which the map tiles are uploaded, because they were being uploaded before the region was registered with the grid
2012-04-27 11:05:40 -07:00
Diva Canto
a9dbe39319
MapImage security issue. Compare strings instead of IPAddresses.
2012-04-27 10:39:20 -07:00
BlueWall
1c60ecf3ed
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-04-27 13:24:09 -04:00
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
BlueWall
0bf3f597fe
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-04-27 12:50:31 -04: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
BlueWall
02cc1ed91a
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-04-26 22:23:36 -04:00
BlueWall
def8012ec1
Changing more methods to work with console and rest
2012-04-26 22:12:10 -04: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
BlueWall
b5db5d7a57
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-04-26 18:17:19 -04: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
Justin Clark-Casey (justincc)
ca228c4770
Comment out old Scene.HandleLogOffUserFromGrid() to reduce client closing analysis complexity
2012-04-26 16:20:53 +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
BlueWall
d76df3df79
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-04-25 14:39:11 -04: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
BlueWall
a153a3cf3b
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-04-25 13:43:48 -04:00
Mic Bowman
1afae01311
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-25 09:52:44 -07:00
Mic Bowman
bec100a662
Add try/catch around Json script method registration to avoild some issues
...
with .NET 3.5 vs 4.0 differences.
See http://opensimulator.org/mantis/view.php?id=5971
2012-04-25 09:51:30 -07:00
BlueWall
cca3c5f66e
Fromatting output, cleanup
2012-04-25 10:50:33 -04:00
BlueWall
6fd803f24f
Some more handlers added/converted
2012-04-25 10:05:41 -04:00
BlueWall
32a70fb7e9
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-04-25 08:47:17 -04:00
Diva Canto
7aa25c6762
Slight rewording of output messages.
2012-04-24 22:40:07 -07:00
Diva Canto
fd281ded3f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-24 22:17:52 -07:00
Diva Canto
cf1c34605b
HG: Moved User-level code down to the HGEntityTransferModule where it belongs.
2012-04-24 22:17:10 -07:00