opensim mirror account
|
f6b88d6208
|
Merge branch 'master' of /var/git/opensim/
|
2010-10-29 15:50:06 -07:00 |
|
Justin Clark-Casey (justincc)
|
e66ec432af
|
Rationalize the logging messages from the merged appearance branch, commenting out most of them as per Mic
|
2010-10-29 23:45:10 +01:00 |
|
opensim mirror account
|
45c6ce65f5
|
Merge branch 'master' of /var/git/opensim/
|
2010-10-29 15:20:04 -07:00 |
|
Justin Clark-Casey (justincc)
|
abcde41c0d
|
Merge branch 'justincc-dev'
|
2010-10-29 23:15:35 +01:00 |
|
Justin Clark-Casey (justincc)
|
25e19ba7e9
|
add timing report to CompleteScenePresence for diagnostic purposes
|
2010-10-29 23:03:11 +01:00 |
|
opensim mirror account
|
4a56ea8d88
|
Merge branch 'master' of /var/git/opensim/
|
2010-10-29 14:10:10 -07:00 |
|
opensim mirror account
|
8d002c4553
|
Merge branch 'master' of /var/git/opensim/
|
2010-10-29 14:00:07 -07:00 |
|
Justin Clark-Casey (justincc)
|
bcd784b316
|
for now, comment out some older or redundant log debug lines to make diagnostics easier
|
2010-10-29 21:49:26 +01:00 |
|
opensim mirror account
|
8acf8eb481
|
Merge branch 'master' of /var/git/opensim/
|
2010-10-29 13:40:07 -07:00 |
|
Justin Clark-Casey (justincc)
|
f19816aeb9
|
Add number of ms it takes to complete UseCircuitCode packet handling to log for diagnostics
|
2010-10-29 21:38:26 +01:00 |
|
Melanie
|
69c1e0b2f7
|
Merge branch 'master' into careminster-presence-refactor
|
2010-10-29 21:22:35 +01:00 |
|
opensim mirror account
|
8d8a795b28
|
Merge branch 'master' of /var/git/opensim/
|
2010-10-29 13:20:04 -07:00 |
|
Melanie
|
4f39329d6f
|
Rename the new default texture to be consistent with the others
|
2010-10-29 21:10:19 +01:00 |
|
Melanie
|
32e5bee3a7
|
Add a default alpha layer
|
2010-10-29 21:09:31 +01:00 |
|
Melanie
|
934e536738
|
Merge commit 'cmickeyb/dev-appearance'
|
2010-10-29 21:06:46 +01:00 |
|
Master ScienceSim
|
49fa7e91b9
|
Clean up some cruft from the last commit. Re-add the initial update
send in the scene presence constructor... need to figure this out
later.
|
2010-10-29 13:45:59 -07:00 |
|
Master ScienceSim
|
f5c9a56c8b
|
Bunch of fixes that reduce the number of times appearance
and avatar data are sent. And the number of times they
are stored.
|
2010-10-29 13:43:35 -07:00 |
|
Melanie
|
5f4badf9e2
|
Add my work on top of cmickeyb's
|
2010-10-29 20:44:29 +01:00 |
|
Melanie
|
05d2302c62
|
Merge branch 'dev-appearance'
|
2010-10-29 20:24:14 +01:00 |
|
Melanie
|
e6fe83cd93
|
Revert "Preliminary work on appearance layers. No user functionality yet."
This work conflicts with cmickeyb's more extensive, related work
This reverts commit 9c829c0410.
|
2010-10-29 20:17:59 +01:00 |
|
opensim mirror account
|
448b83b105
|
Merge branch 'master' of /var/git/opensim/
|
2010-10-29 11:50:10 -07:00 |
|
Melanie
|
840b75ca9b
|
Add my work on top of cmickeyb's
|
2010-10-29 20:48:37 +02:00 |
|
Melanie
|
9331898c32
|
Merge branch 'master' into careminster-presence-refactor
|
2010-10-29 20:40:48 +01:00 |
|
Melanie
|
b800a299aa
|
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
|
2010-10-29 20:36:03 +02:00 |
|
Melanie
|
dbd1a68b58
|
Fix a LSL issue and a prim naming issue
|
2010-10-29 20:35:06 +02:00 |
|
Melanie
|
3231602b88
|
Revert "Preliminary work on appearance layers. No user functionality yet."
This reverts commit e6a8d2872c.
|
2010-10-29 20:34:53 +02:00 |
|
Melanie
|
bd4e3b0aaf
|
Add a default alpha layer
|
2010-10-29 20:31:17 +02:00 |
|
Melanie
|
9c829c0410
|
Preliminary work on appearance layers. No user functionality yet.
|
2010-10-29 18:58:22 +01:00 |
|
Melanie
|
e2b08bac6d
|
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
|
2010-10-29 18:56:20 +01:00 |
|
Melanie
|
13129f1a8d
|
Preliminary work on appearance layers. No user functionality yet.
|
2010-10-29 18:55:58 +01:00 |
|
Melanie
|
e6a8d2872c
|
Preliminary work on appearance layers. No user functionality yet.
|
2010-10-29 18:59:53 +02:00 |
|
opensim mirror account
|
8b867ba23e
|
Merge branch 'master' of /var/git/opensim/
|
2010-10-28 17:40:06 -07:00 |
|
Marck
|
7b0d643999
|
HypergridLinker optimizations and enable use of owner_uuid/EstateOwner with linked regions.
* Added check for already occupied region coordinates.
* Optimized Check4096.
|
2010-10-28 17:21:17 -07:00 |
|
Master ScienceSim
|
68666efd25
|
Configuration of persistent baked textures and save/send delays.
|
2010-10-28 12:00:04 -07:00 |
|
Master ScienceSim
|
f2c1d0e34f
|
Merge branch 'opensim-master' into dev-appearance
|
2010-10-28 09:09:42 -07:00 |
|
Master ScienceSim
|
0f28fa400d
|
Added background thread to handle delayed send and save of appearance
to accommodate batching of the many updates that happen on login
and teleport.
Fixed handling of the serial property in appearance.
|
2010-10-28 09:00:39 -07:00 |
|
Melanie
|
a51a545cb9
|
Fix attached sounds from HUDs erroneously being delivered to other avatars
|
2010-10-28 13:24:45 +01:00 |
|
opensim mirror account
|
71d9fac757
|
Merge branch 'master' of /var/git/opensim/
|
2010-10-27 21:40:03 -07:00 |
|
Jeff Ames
|
727838f914
|
Formatting cleanup.
|
2010-10-28 00:37:32 -04:00 |
|
opensim mirror account
|
0269ec6af0
|
Merge branch 'master' of /var/git/opensim/
|
2010-10-27 13:40:10 -07:00 |
|
Melanie
|
05dbe4f2c4
|
Merge branch 'master' into careminster-presence-refactor
|
2010-10-27 20:49:27 +01:00 |
|
Melanie
|
1fcac7203d
|
Prevent nullrefs in scene object deletion. Mantis #5156
|
2010-10-27 20:47:27 +01:00 |
|
opensim mirror account
|
6f297a50cb
|
Merge branch 'master' of /var/git/opensim/
|
2010-10-26 21:30:05 -07:00 |
|
dahlia
|
a4e95c0717
|
Merge branch 'master' of ssh://MyConnection01/var/git/opensim
|
2010-10-26 21:20:18 -07:00 |
|
dahlia
|
5968d343bb
|
Overload Scene.NewUserConnection() to facilitate NPCs and other region specific applications
|
2010-10-26 21:19:33 -07:00 |
|
opensim mirror account
|
d6771ed4d5
|
Merge branch 'master' of /var/git/opensim/
|
2010-10-26 21:10:12 -07:00 |
|
Jeff Ames
|
a331fd4e24
|
Formatting cleanup.
|
2010-10-27 00:01:03 -04:00 |
|
Master ScienceSim
|
9cfd3e1d5a
|
Small cleanup and add more debugging information
|
2010-10-26 12:54:28 -07:00 |
|
Master ScienceSim
|
9132e251aa
|
Made the check for texture assets asynchronous. This is one part of
a bigger clean up that needs to happen around locks on appearance.
|
2010-10-26 12:53:15 -07:00 |
|
Jonathan Freedman
|
5da2743c37
|
Merge branch 'master' into mantis5110
|
2010-10-25 22:27:35 -04:00 |