Kitto Flora
|
49dbae65c9
|
Merge branch 'master' into tests
|
2009-12-12 10:14:06 -05:00 |
|
Kitto Flora
|
b056c243e4
|
Commit partial work because of repo change
|
2009-12-12 10:12:59 -05:00 |
|
Melanie
|
c00158b238
|
Reverse test commit (again)
|
2009-12-12 14:35:12 +00:00 |
|
Melanie
|
794419852b
|
Another test
|
2009-12-12 14:23:20 +00:00 |
|
Melanie
|
fbafd22124
|
Reverse text commit whitespace change
|
2009-12-12 13:43:49 +00:00 |
|
Melanie
|
b9cd66d510
|
test commit
|
2009-12-12 13:33:45 +00:00 |
|
Melanie
|
b310efc50f
|
Merge branch 'master' into careminster
|
2009-12-12 12:54:43 +00:00 |
|
Teravus Ovares (Dan Olivares)
|
0639e90f56
|
* Bugfix mantis 4441, "Use of Autopilot isn't playing any animations."
* Turns out the new animator used a different movement bitflag then the one used in the code to autopilot the avatar
|
2009-12-12 02:41:59 -05:00 |
|
Teravus Ovares (Dan Olivares)
|
35961caec6
|
Merge branch 'master' of ssh://MyConnection/var/git/opensim
|
2009-12-12 01:24:25 -05:00 |
|
Melanie
|
0fdf883cbd
|
Merge branch 'master' into careminster
|
2009-12-12 04:56:28 +00:00 |
|
Kunnis
|
d89f3e9811
|
Getting rid of SimpleRegionInfo and SerializableRegionInfo per Mel
Signed-off-by: Melanie <melanie@t-data.com>
|
2009-12-12 04:44:32 +00:00 |
|
Melanie
|
1382dc976c
|
Merge branch 'master' into careminster
|
2009-12-12 04:14:47 +00:00 |
|
Melanie
|
83ca7db4b8
|
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
|
2009-12-12 04:14:12 +00:00 |
|
Diva Canto
|
81debdfebe
|
A few more guards along the path to user server.
|
2009-12-11 20:20:18 -08:00 |
|
Kunnis
|
62ec60ca76
|
Getting rid of a bunch of old classes, that are likely left over from the ROBUST change.
Signed-off-by: Melanie <melanie@t-data.com>
|
2009-12-12 04:13:39 +00:00 |
|
Diva Canto
|
d20fe7bfdd
|
A couple of more sanity guards, but this won't fix things when user profile fetching is borked.
|
2009-12-11 20:06:42 -08:00 |
|
Diva Canto
|
4bbe9a51ac
|
Added an image uuid to objects marked "Show in search". Only works for boxes.
|
2009-12-11 09:09:36 -08:00 |
|
Diva Canto
|
5f0478c4c4
|
Fix to make [bad] tests happy.
|
2009-12-11 08:28:24 -08:00 |
|
Diva Canto
|
decd51f081
|
Attempt at fixing mantis #4411.
|
2009-12-11 08:11:26 -08:00 |
|
Melanie
|
54e4dcf454
|
Merge branch 'master' into careminster
|
2009-12-11 02:49:41 +00:00 |
|
Melanie
|
204c59c5ac
|
Refix the fix
|
2009-12-11 02:42:05 +00:00 |
|
grid
|
d68b664243
|
Kill a NRE caused by an error message trying to print unavailable data
|
2009-12-11 02:42:00 +00:00 |
|
Melanie
|
f6b1344722
|
Refix the fix
|
2009-12-11 02:40:33 +00:00 |
|
grid
|
5ffd59e7b8
|
Kill a NRE caused by an error message trying to print unavailable data
|
2009-12-10 22:09:16 -05:00 |
|
Adam Frisby
|
6d7c10b2b4
|
* Diagnosing a connection issue.
|
2009-12-11 13:19:32 +11:00 |
|
Melanie
|
0889b5aef1
|
Fix version number
|
2009-12-10 18:20:40 +00:00 |
|
Melanie
|
59ca92b10b
|
Merge branch 'tests' of kitto@tor.k-grid.com:/home/kitto/opensim into careminster
|
2009-12-10 18:17:29 +00:00 |
|
Melanie
|
956f337046
|
Merge branch 'careminster' of kitto@tor.k-grid.com:/home/kitto/opensim into careminster
|
2009-12-09 22:07:03 +00:00 |
|
CasperW
|
a6a6bf007a
|
Move osFunctions into a new Careminster script interface
|
2009-12-09 23:28:00 +01:00 |
|
Melanie
|
2e9890bbe6
|
Merge branch 'careminster' of kitto@tor.k-grid.com:/home/kitto/opensim into careminster
|
2009-12-09 16:57:35 +00:00 |
|
Melanie
|
f2427a7320
|
Merge branch 'master' into careminster
|
2009-12-09 16:57:26 +00:00 |
|
CasperW
|
2a6dbd068e
|
Last bits and bobs to clean up the Meta7WindlightModule
|
2009-12-09 03:58:56 +01:00 |
|
unknown
|
d092977f4a
|
Windlight configuration option in ini, and migration
|
2009-12-09 01:53:41 +01:00 |
|
unknown
|
e3f229225c
|
Enable scripting interface for windlight
|
2009-12-09 01:34:26 +01:00 |
|
Teravus Ovares (Dan Olivares)
|
2f8b9cbf2b
|
* Commit some sit code that's commented out for now.
|
2009-12-08 11:28:13 -05:00 |
|
KittoFlora
|
ee9d46c825
|
Correct AbsolutePosition calculation
|
2009-12-08 05:49:05 +01:00 |
|
unknown
|
dbd8c400ce
|
Merge branch 'careminster' into windlight
|
2009-12-07 18:14:02 +01:00 |
|
unknown
|
29a740ec8c
|
Initial windlight codebase commit
|
2009-12-07 18:05:40 +01:00 |
|
Melanie
|
dd5696e8bd
|
Same for the remote auth connector
|
2009-12-07 14:31:55 +00:00 |
|
Melanie
|
c2d3afdeee
|
Same for the remote auth connector
|
2009-12-07 14:31:20 +00:00 |
|
Melanie
|
9155c9ee37
|
Merge branch 'master' into careminster
|
2009-12-07 14:14:00 +00:00 |
|
Melanie
|
ad2c23d507
|
Stop AuthorizationService from throwing an error if it's not configured.
Optional services should not cause red spew when they're not wanted
|
2009-12-07 14:12:53 +00:00 |
|
KittoFlora
|
0d1d437bd3
|
Fix linked physical daughter prim position update.
|
2009-12-06 21:11:59 +01:00 |
|
CasperW
|
b15f20520f
|
Merge branch 'careminster' of ssh://TOR/home/kitto/opensim/ into careminster
|
2009-12-06 17:23:22 +01:00 |
|
CasperW
|
172e2f4e76
|
Fix to existing ReaderWriterLockSlim implementations
|
2009-12-06 17:23:07 +01:00 |
|
Melanie
|
23cd1b1954
|
Revert "Make ObjectSelect packet processing not use FireAndForget"
This reverts commit cade14c58c.
|
2009-12-06 05:24:43 +00:00 |
|
Melanie
|
cade14c58c
|
Make ObjectSelect packet processing not use FireAndForget
|
2009-12-06 05:14:17 +00:00 |
|
Kunnis
|
4c61fcfc40
|
Getting rid of the dead field RootInventoryFolderId on UserProfileData, It's not even stored in mysql.
Signed-off-by: Melanie <melanie@t-data.com>
|
2009-12-06 03:57:15 +00:00 |
|
Melanie
|
1e222d52e6
|
Change EntityManager to use RWlocks
|
2009-12-06 03:56:15 +00:00 |
|
Melanie
|
f9ae9afaac
|
Fix build break from conflicted merge
|
2009-12-06 03:10:34 +00:00 |