Dan Lake
3eb13b6664
Merge branch 'dev' of ssh://island.sciencesim.com/home/sceneapi/sceneapi into dev
2011-06-03 13:13:23 -07:00
Dan Lake
6b31808f49
Added back the 32bit ODE dll as ode.32bit.dll in case someone wants to use it
2011-06-03 13:12:59 -07:00
Dan Lake
ef8b2f4711
Replaced ode.dll with 64 bit version
2011-06-03 13:10:00 -07:00
Huaiyu (Kitty) Liu
8ab8969d82
Fixed the problem of non-recoganized localID in PhysicsCollision -- if it is 0,
...
it means it's land collision, not errors.
2011-06-03 12:06:58 -07:00
Diva Canto
cf86ba5559
Added prefix HG to the name of the landmark item in inventory, as a soft reminder that the landmark belongs to a place in another grid. People can change the name, but that's their decision.
2011-06-03 11:48:24 -07:00
Huaiyu (Kitty) Liu
06d002cc3b
On handling UpdatePrimProperties, if the properties updated are all in the terse-update
...
list, only trigger SOP.ScheduleTerseUpdate; otherwise, trigger ScheduleFullUpdate.
This is to prevent client managers to send big updates to clients, especially when a link-set
object moves around.
2011-06-03 11:35:37 -07:00
Diva Canto
623706d988
HG Landmarks bug fix: pull landmark asset data from user's asset server when user is traveling.
2011-06-03 11:33:44 -07:00
Diva Canto
fde3e704d3
oops
2011-06-03 10:50:55 -07:00
Diva Canto
4ea89f39f2
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-06-03 10:32:21 -07:00
Diva Canto
7772640ae8
.ini.example's updated for HG Landmarks
2011-06-03 10:29:59 -07:00
Diva Canto
e33cedfd42
HG Landmarks now working.
2011-06-03 10:26:58 -07:00
Diva Canto
995b893e4c
HG Landmarks being created. WARNING: new config var under [HGInventoryAccessModule], Gatekeeper.
2011-06-03 09:04:34 -07:00
Diva Canto
76c60f1f99
Moved CreateNewInventoryItem to the InventoryAccessModule in preparation for supporting HG landmarks.
2011-06-03 08:27:01 -07:00
Huaiyu (Kitty) Liu
fa892e4afb
Fixed bug(s) in CompareAndUpdateSOPGroupPosition and CompareAndUpdateSOPPosition
...
that may cause script engine to crash.
2011-06-02 16:37:01 -07:00
Justin Clark-Casey (justincc)
dfa4442319
Move the "!!!Standalone Only!!!" [FreeswitchService] section from OpenSim.ini.example to config/StandaloneCommon.ini.example where it belongs.
2011-06-02 22:43:44 +01:00
Justin Clark-Casey (justincc)
b8e2ee6978
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-06-02 21:48:50 +01:00
Justin Clark-Casey (justincc)
b000d4f67f
minor: add ini.example doc to hint that the server address in [FreeswitchService] must be reachable by viewers
2011-06-02 21:37:17 +01:00
Huaiyu (Kitty) Liu
fdb4e92dc3
Added/edited a few debug messeges to provide more info for debugging.
2011-06-02 13:35:20 -07:00
Huaiyu (Kitty) Liu
fd99eea0af
Added lock(m_syncRoot) in handling NewAvatar messages, so that adding/removing
...
from RemoveAvatars list are serialized.
2011-06-02 12:00:03 -07:00
Huaiyu (Kitty) Liu
ee7b965bf9
Commented out debug messages for VolumnDetect sync and collisions.
...
Took out the warning message when reported collided SOP/SP is no
longer is local Scene.
2011-06-02 10:58:39 -07:00
Diva Canto
2a12d143c2
HG IM: increase the timeout value
2011-06-02 10:44:10 -07:00
Diva Canto
6312eea459
HG IM bug fix: grid_instant_message was being placed in the default port instead of the specified one.
2011-06-02 10:14:26 -07:00
Diva Canto
65c71050cc
Extra debug message
2011-06-02 09:39:29 -07:00
Diva Canto
3c15c0b264
Added test IM client.
2011-06-02 09:39:09 -07:00
Diva Canto
4696a9c95e
Bug fix on HG IM.
2011-06-02 08:13:54 -07:00
Diva Canto
f2f30a7890
HG Friends bug fix: connector was shrinking principalID to UUID.
2011-06-02 07:26:40 -07:00
Diva Canto
c13acdf5a1
This is the better solution: make the combined key be only on the first 36 characters of each field -- that's the UUIDs. Thanks coyled. WARNING: Again, people who have gone through this migration and failed need to run it manually.
2011-06-01 20:19:22 -07:00
Diva Canto
43ecc46a22
It looks like there's a better solution for that problem.
...
Revert "Changed Friends table to have 165-sized varchars on PrincipalID and FriendID. The reason for this number is the following: there is a combined key of these 2 fields; apparently MySql can't handle keys larger than 1000 bytes; when the table is created with utf8 encoding, this combined key is bigger than 1000 bytes, and the migration fails. WARNING: this is not a new migration! People who have gone through this migration and failed should update the sizes of these fields manually."
This reverts commit 3fa54a156a
.
2011-06-01 20:09:59 -07:00
Diva Canto
3fa54a156a
Changed Friends table to have 165-sized varchars on PrincipalID and FriendID. The reason for this number is the following: there is a combined key of these 2 fields; apparently MySql can't handle keys larger than 1000 bytes; when the table is created with utf8 encoding, this combined key is bigger than 1000 bytes, and the migration fails. WARNING: this is not a new migration! People who have gone through this migration and failed should update the sizes of these fields manually.
2011-06-01 20:02:26 -07:00
Diva Canto
46cdd442a8
[Profiles] --> [Profile]
2011-06-01 18:18:31 -07:00
BlueWall
777f57d946
Re-Apply Use current TravelingAgent if the the login failure reason is "Logins Disabled" to fix NullReferenceException, allowing agent to login to fallback region when logins are disabled by "StartDisabled = true" or when logins are disabled by RegionReady""
...
This reverts commit 0a430bbffb
.
2011-06-01 18:47:06 -04:00
Huaiyu (Kitty) Liu
b03ecf24c4
Added catching exceptions other than WebException in doIMSending, so that
...
it won't crash script engine and will report what exception it is.
2011-06-01 15:37:14 -07:00
BlueWall
0a430bbffb
Revert "Use current TravelingAgent if the login failure reason is "Logins Disabled" to fix NullReferenceException, allowing agent to login to fallback region when logins are disabled by "StartDisabled = true" or when logins are disabled by RegionReady"
...
This reverts commit 4b9e446c62
.
2011-06-01 18:10:56 -04:00
Huaiyu (Kitty) Liu
1cbbb010b0
Edited a warning message in collision event sync, to be more informational.
2011-06-01 14:19:27 -07:00
BlueWall
ac4d080aaf
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-06-01 17:01:40 -04:00
BlueWall
984b801dd9
Merge branch 'master' of /home/opensim/src/opensim
2011-06-01 17:01:08 -04:00
BlueWall
4b9e446c62
Use current TravelingAgent if the login failure reason is "Logins Disabled" to fix NullReferenceException, allowing agent to login to fallback region when logins are disabled by "StartDisabled = true" or when logins are disabled by RegionReady
2011-06-01 16:57:01 -04:00
Makopoppo
b0ed0e63dc
Adding boolean alias for commandline switches like -save_crashes=yes
2011-06-01 21:14:16 +01:00
Makopoppo
54096db30b
Fix: The command line switches 'save_crashes' and 'crash_dir' haven't actually worked
2011-06-01 21:06:43 +01:00
Chris Hart
5fb0455e92
Updates to MSSQL to most recent compatibility, also included Windlight support. Needs plenty of testing but clean install and migration from 0.6.9 have been tested and work, a few indexes still need to be added for performance.
2011-06-01 21:01:04 +01:00
Justin Clark-Casey (justincc)
a3e0895f12
a few minor formatting tweaks
2011-06-01 20:55:03 +01:00
James Stallings aka Hiro Protagonist
c43ad8a0e7
A final couple of tweaks to GroupsModule.cs. Remove unneeded delegate, and prettify codeing style/formatting
2011-06-01 20:51:52 +01:00
Justin Clark-Casey (justincc)
8bacf56e46
revert the prematurely included groups patch, yet again
2011-06-01 20:51:38 +01:00
Huaiyu (Kitty) Liu
e2b6c5d199
Added a new RegionSyncMessage, AvatarTeleportSameRegion, for PSA to inform PE to
...
update avatar positon after teleporting within the same region, and the logic
to send/receive the message. Teleporting within the same region seems working now
with remote PE.
2011-06-01 11:34:42 -07:00
BlueWall
929bdba346
Merge branch 'master' of /home/opensim/src/opensim
2011-06-01 13:47:38 -04:00
BlueWall
aed6e74080
Add alternate region handling for url based logins as found in login to "home" or "last"
2011-06-01 13:44:20 -04:00
Huaiyu (Kitty) Liu
3c58a1c244
Merge branch 'dev' into dev_demo_debug
2011-06-01 10:06:42 -07:00
Huaiyu (Kitty) Liu
8dc3b85828
Marked ChangingActorID in PECharacter constructor, so that PEScene.Simulate()
...
will catch the update (pos, etc) and trigger RouteUpdate.
2011-06-01 10:02:50 -07:00
Dan Lake
3a582a4cec
TEMP: commented out agent limits in scene as a workaround for DSG demos
2011-06-01 10:01:04 -07:00
Robert Adams
b3efab2bbd
Add ChangingActorID setting for value changes from physics engine. Works much better distributed
2011-05-31 17:48:37 -07:00