UbitUmarov
|
03ef125ba0
|
Merge branch 'avination' into ubitwork
Conflicts:
OpenSim/Region/Physics/Meshing/Meshmerizer.cs
|
2012-10-07 06:13:24 +01:00 |
|
UbitUmarov
|
4a87a8f3b9
|
comment out a spam coment on core Meshmerizer
|
2012-10-07 06:11:51 +01:00 |
|
UbitUmarov
|
4efc90ef37
|
i update core ode plugin and make it load is meshs (i hope)
|
2012-10-07 05:53:52 +01:00 |
|
ubit
|
7e1eecdf73
|
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
|
2012-10-07 02:22:28 +02:00 |
|
UbitUmarov
|
78ce7a0a04
|
[DANGER UNTESTED] ODE mesh assets. Other plugins will not do meshs/sculpts
now
|
2012-10-07 01:20:52 +01:00 |
|
ubit
|
ceb33b24f7
|
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
|
2012-10-05 07:04:58 +02:00 |
|
UbitUmarov
|
5254c0de8f
|
Merge branch 'avination' into ubitwork
|
2012-10-05 06:00:45 +01:00 |
|
UbitUmarov
|
db00402fa8
|
make sure a buffer is closed, and changed a misleading log msg
|
2012-10-05 00:14:49 +01:00 |
|
Melanie
|
d5ea203f93
|
Fix threading in remote asset connector
|
2012-10-05 00:15:55 +02:00 |
|
Melanie
|
efb9b7014e
|
Allow default animation to be stopped to be replaced with another one.
Fixes Mantis #6327
|
2012-10-04 15:20:04 +02:00 |
|
ubit
|
717802ab09
|
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
|
2012-10-04 09:16:21 +02:00 |
|
UbitUmarov
|
89d342b5ce
|
more changes and more non active code
|
2012-10-04 08:14:52 +01:00 |
|
ubit
|
840d56dcec
|
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
|
2012-10-04 06:30:51 +02:00 |
|
UbitUmarov
|
113549c2e9
|
apply cmic fix to multi layer wearables
|
2012-10-04 05:29:32 +01:00 |
|
ubit
|
fa5fd77823
|
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
|
2012-10-04 06:06:21 +02:00 |
|
UbitUmarov
|
893b44497d
|
Merge branch 'avination' into ubitwork
|
2012-10-04 05:05:57 +01:00 |
|
ubit
|
5bf8c54207
|
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
|
2012-10-04 05:59:03 +02:00 |
|
UbitUmarov
|
51e1830f86
|
more changes. Most code not in use
|
2012-10-04 04:55:53 +01:00 |
|
ubit
|
57bfd38e2a
|
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
|
2012-10-04 00:18:57 +02:00 |
|
UbitUmarov
|
a9f2bc150f
|
missing changed file
|
2012-10-03 23:18:35 +01:00 |
|
ubit
|
d657c48abf
|
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
|
2012-10-04 00:17:19 +02:00 |
|
UbitUmarov
|
9988558ec1
|
meshworker basic replacement of SOP CheckSculptAndLoad ( for now disabled
for all physics engines)
|
2012-10-03 23:14:56 +01:00 |
|
ubit
|
33b2096c5f
|
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
|
2012-10-03 21:38:35 +02:00 |
|
UbitUmarov
|
4f51cc325c
|
making meshworker have more work..
|
2012-10-03 20:36:41 +01:00 |
|
ubit
|
149c2adf7d
|
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
|
2012-10-03 20:35:29 +02:00 |
|
UbitUmarov
|
7137b234b4
|
introduce a ODEMeshWorker class, should be pure cosmetic changes for now
|
2012-10-03 19:33:28 +01:00 |
|
Melanie
|
fdacb88b29
|
Fix a viewer crash issue
|
2012-10-03 17:11:02 +02:00 |
|
Melanie
|
f433ee317b
|
Attempt to fix Mantis #6311. Honor a destination folder if one is given
|
2012-10-02 23:03:52 +01:00 |
|
ubit
|
acdbe6e9dd
|
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
|
2012-09-28 00:16:22 +02:00 |
|
Melanie
|
f05ca1a0fe
|
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
|
2012-09-28 00:15:58 +02:00 |
|
Melanie
|
7e21ddeeff
|
Fix a possible NRE
|
2012-09-28 00:15:14 +02:00 |
|
UbitUmarov
|
58e55ae075
|
make some forgotten changes be done by simulation thread not by caller
|
2012-09-27 23:14:42 +01:00 |
|
Melanie
|
285039949c
|
Update the Http server with a few additional properties. Adapt the test
server code to match.
|
2012-09-27 18:27:49 +01:00 |
|
ubit
|
5482c086f0
|
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
|
2012-09-27 01:16:22 +02:00 |
|
UbitUmarov
|
a0065ad616
|
create a new PollServiceHttpRequest req per loop since they can be sent to
another working thread
|
2012-09-27 00:14:50 +01:00 |
|
Melanie
|
6cf51c329a
|
Merge branch 'ubitwork' into avination
|
2012-09-26 23:49:02 +02:00 |
|
Melanie
|
2998a2df6a
|
Streamline and improve llGetMass
|
2012-09-26 22:30:09 +02:00 |
|
ubit
|
810e24af49
|
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
|
2012-09-26 22:04:27 +02:00 |
|
UbitUmarov
|
a70352db17
|
don't send a partial contents report if we are sending all data
|
2012-09-26 21:03:31 +01:00 |
|
UbitUmarov
|
c3ea00f16e
|
add assettype mesh to list of binary assets
|
2012-09-26 20:31:34 +01:00 |
|
ubit
|
4da310c870
|
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
|
2012-09-26 17:50:20 +02:00 |
|
UbitUmarov
|
9a04269644
|
fix GetTextureHandler range
|
2012-09-26 16:49:39 +01:00 |
|
ubit
|
de87eca20f
|
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
|
2012-09-26 17:20:48 +02:00 |
|
UbitUmarov
|
be9cef8682
|
missing file
|
2012-09-26 16:20:26 +01:00 |
|
ubit
|
b07b29c247
|
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
|
2012-09-26 17:18:31 +02:00 |
|
UbitUmarov
|
617f1b9223
|
just remove the damm thing
|
2012-09-26 16:17:49 +01:00 |
|
ubit
|
24539a074e
|
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
|
2012-09-26 16:44:34 +02:00 |
|
UbitUmarov
|
7e3eba1064
|
Seems nothing actually need the request body for getevents. so change
control flag to false
|
2012-09-26 15:41:57 +01:00 |
|
UbitUmarov
|
abb4b9fcae
|
UriModule GetEvents also doesn't need a request body
|
2012-09-26 15:11:59 +01:00 |
|
UbitUmarov
|
67fa657746
|
keep watchdog happy using it to kill his threads
|
2012-09-26 04:52:19 +01:00 |